[oe-commits] org.oe.dev gcc-package: package more files and attempt to unbreak the case where PV_gcc != PV_gcc-cross

[koen commit]

gcc-package: package more files and attempt to unbreak the case where PV_gcc != PV_gcc-cross

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dd2914802be68a8406e20f6af7f15a588be59465
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dd2914802be68a8406e20f6af7f15a588be59465
Files:
1
packages/gcc/gcc-package.inc
Diffs:

#
# mt diff -r1355723ed53d5d0f7ed5f494ecc2ba21bd01d219 -rdd2914802be68a8406e20f6af7f15a588be59465
#
# 
# 
# patch "packages/gcc/gcc-package.inc"
#  from [63a5f75088afa1390fc31b2ee6b81d4f11314e88]
#    to [b2cbff5be7f56b50952a7fc189da13a945e8ff6e]
# 
============================================================
--- packages/gcc/gcc-package.inc	63a5f75088afa1390fc31b2ee6b81d4f11314e88
+++ packages/gcc/gcc-package.inc	b2cbff5be7f56b50952a7fc189da13a945e8ff6e
@@ -1,14 +1,14 @@ BINV ?= "${PV}"
 gcclibdir ?= "${libdir}/gcc"
 BINV ?= "${PV}"
 
-# libgcc libstdc++ libg2c are listed in our FILES_*, but are actually
-# packaged in the respective cross packages.
-PACKAGES = "${PN} ${PN}-symlinks \
+PACKAGES = "libgcc ${PN} ${PN}-symlinks \
             g++ g++-symlinks \
 	    cpp cpp-symlinks \
             g77 g77-symlinks \
 	    gcov gcov-symlinks \
-            libstdc++-dev libg2c-dev \
+            libmudflap libmudflap-dev \
+	    libstdc++ libg2c \
+	    libstdc++-dev libg2c-dev \
             ${PN}-doc"
 
 FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
@@ -35,7 +35,11 @@ FILES_gcov-symlinks = "${bindir}/gcov"
 FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
 FILES_gcov-symlinks = "${bindir}/gcov"
 
+FILES_libgcc = "${base_libdir}/libgcc*.so.*"
+FILES_libgcc-dev = "${base_libdir}/libgcc*.so"
+
 # Called from within gcc-cross, so libdir is set wrong
+FILES_libg2c = "${target_libdir}/libg2c.so.*"
 FILES_libg2c-dev = "${libdir}/libg2c.so \
 		    ${libdir}/libg2c.a \
 		    ${libdir}/libfrtbegin.a"
@@ -45,6 +49,7 @@ FILES_g++-symlinks = "${bindir}/c++ \
 FILES_g++-symlinks = "${bindir}/c++ \
 			    ${bindir}/g++"
 
+FILES_libstdc++ = "${libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
 		       ${libdir}/libstdc++.so \
 		       ${libdir}/libstdc++.la \
@@ -52,6 +57,12 @@ FILES_libstdc++-dev = "${includedir}/c++
 		       ${libdir}/libsupc++.la \
 		       ${libdir}/libsupc++.a"
 
+FILES_libmudflap = "${libdir}/libmudflap*.so.*"
+FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
+                        ${libdir}/libmudflap*.a \
+                        ${libdir}/libmudflap*.a"
+
+
 FILES_${PN}-doc = "${infodir} \
 		   ${mandir} \
 		   ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"