gcc: Fix sdk packaging issues

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1972 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 305365a143f22074f35cd51f0d2d90fcfdaf1a5c..238f5c2fd0d5a7454bddb6caa36a65018ca892e8 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 inherit sdk
 

diff --git a/meta/packages/gcc/gcc-package-sdk.inc b/meta/packages/gcc/gcc-package-sdk.inc
index 1e5f2aaa5d9cc731b781916b959a9f6eca0c557f..a910a8dc4de3bf5a04555038ff9c190f8a2af69b 100644 (file)
--- a/meta/packages/gcc/gcc-package-sdk.inc
+++ b/meta/packages/gcc/gcc-package-sdk.inc
@@ -6,7 +6,6 @@ HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-
 python do_package() {
        if bb.data.getVar('DEBIAN_NAMES', d, 1):
                bb.data.setVar('PKG_libgcc', 'libgcc1', d)
@@ -16,32 +15,24 @@ python do_package() {
 do_install () {
        oe_runmake 'DESTDIR=${D}' install
 
-       # Move libgcc_s into /lib
-       mkdir -p ${D}${base_libdir}
-       if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then
-               # Already in the right location
-               :
-       elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
-               mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
-       else
-               mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
+       # Manually run the target stripper since we won't get it run by
+       # the packaging.
+       if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
+               ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libstdc++.so.*
+               ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libg2c.so.* || true
+               ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.*
        fi
+}
 
-       # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
-       mkdir -p ${D}${libdir}
-       mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${libdir}
-       if [ "${HAS_G2C}" = "yes" ]; then
-         mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${libdir}
-       fi
-       if [ "${HAS_GFORTRAN}" = "yes" ]; then
-         mv -f ${D}${prefix}/*/lib/libgfortran*.so.* ${D}${libdir}
-       fi
+FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*"
+FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so"
 
-       # Manually run the target stripper since we won't get it run by
-       # the packaging.
-       if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-               ${TARGET_PREFIX}strip ${D}${libdir}/libstdc++.so.*
-               ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.* || true
-               ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
-       fi
-}
+FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*"
+FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
+                       ${prefix}/${TARGET_SYS}/lib/libstdc++.so \
+                       ${prefix}/${TARGET_SYS}/lib/libstdc++.a \
+                       ${prefix}/${TARGET_SYS}/lib/libsupc++.a"
+
+FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*"
+FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \
+                        ${prefix}/${TARGET_SYS}/lib/libmudflap*.a"

diff --git a/meta/packages/gcc/gcc-package.inc b/meta/packages/gcc/gcc-package.inc
index 3be1f2f0e00501d29e263dce96ccf0a63ca107c5..0d15134c062095031832f4cb228ea2fb3eb8deb1 100644 (file)
--- a/meta/packages/gcc/gcc-package.inc
+++ b/meta/packages/gcc/gcc-package.inc
@@ -1,7 +1,8 @@
 gcclibdir ?= "${libdir}/gcc"
 BINV ?= "${PV}"
 
-PACKAGES = "libgcc ${PN} ${PN}-symlinks \
+PACKAGES = "libgcc libgcc-dev \
+            ${PN} ${PN}-symlinks \
             g++ g++-symlinks \
            cpp cpp-symlinks \
             g77 g77-symlinks \
@@ -59,7 +60,6 @@ FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
 
 FILES_libmudflap = "${libdir}/libmudflap*.so.*"
 FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
-                        ${libdir}/libmudflap*.a \
                         ${libdir}/libmudflap*.a"