diff options
author | Richard Purdie <richard@openedhand.com> | 2007-06-18 21:06:43 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-06-18 21:06:43 +0000 |
commit | 29dc7ae341e6725234b57f3f15b1ee60a6f7a928 (patch) | |
tree | ee8854a7d8c58f84f09cac5d3888cecadbb08871 /meta/packages/gcc/gcc-package-sdk.inc | |
parent | 9eb40c6dadc1b8f61b3fcf462ef519bbd984fb9a (diff) | |
download | poky-29dc7ae341e6725234b57f3f15b1ee60a6f7a928.tar.gz |
gcc: Fix sdk packaging issues
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1972 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc/gcc-package-sdk.inc')
-rw-r--r-- | meta/packages/gcc/gcc-package-sdk.inc | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/meta/packages/gcc/gcc-package-sdk.inc b/meta/packages/gcc/gcc-package-sdk.inc index 1e5f2aaa5d..a910a8dc4d 100644 --- a/meta/packages/gcc/gcc-package-sdk.inc +++ b/meta/packages/gcc/gcc-package-sdk.inc | |||
@@ -6,7 +6,6 @@ HAS_GFORTRAN ?= "no" | |||
6 | OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" | 6 | OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" |
7 | INHIBIT_PACKAGE_STRIP = "1" | 7 | INHIBIT_PACKAGE_STRIP = "1" |
8 | 8 | ||
9 | |||
10 | python do_package() { | 9 | python do_package() { |
11 | if bb.data.getVar('DEBIAN_NAMES', d, 1): | 10 | if bb.data.getVar('DEBIAN_NAMES', d, 1): |
12 | bb.data.setVar('PKG_libgcc', 'libgcc1', d) | 11 | bb.data.setVar('PKG_libgcc', 'libgcc1', d) |
@@ -16,32 +15,24 @@ python do_package() { | |||
16 | do_install () { | 15 | do_install () { |
17 | oe_runmake 'DESTDIR=${D}' install | 16 | oe_runmake 'DESTDIR=${D}' install |
18 | 17 | ||
19 | # Move libgcc_s into /lib | 18 | # Manually run the target stripper since we won't get it run by |
20 | mkdir -p ${D}${base_libdir} | 19 | # the packaging. |
21 | if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then | 20 | if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then |
22 | # Already in the right location | 21 | ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libstdc++.so.* |
23 | : | 22 | ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libg2c.so.* || true |
24 | elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then | 23 | ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.* |
25 | mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} | ||
26 | else | ||
27 | mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} | ||
28 | fi | 24 | fi |
25 | } | ||
29 | 26 | ||
30 | # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr | 27 | FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*" |
31 | mkdir -p ${D}${libdir} | 28 | FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so" |
32 | mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${libdir} | ||
33 | if [ "${HAS_G2C}" = "yes" ]; then | ||
34 | mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${libdir} | ||
35 | fi | ||
36 | if [ "${HAS_GFORTRAN}" = "yes" ]; then | ||
37 | mv -f ${D}${prefix}/*/lib/libgfortran*.so.* ${D}${libdir} | ||
38 | fi | ||
39 | 29 | ||
40 | # Manually run the target stripper since we won't get it run by | 30 | FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*" |
41 | # the packaging. | 31 | FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ |
42 | if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then | 32 | ${prefix}/${TARGET_SYS}/lib/libstdc++.so \ |
43 | ${TARGET_PREFIX}strip ${D}${libdir}/libstdc++.so.* | 33 | ${prefix}/${TARGET_SYS}/lib/libstdc++.a \ |
44 | ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.* || true | 34 | ${prefix}/${TARGET_SYS}/lib/libsupc++.a" |
45 | ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* | 35 | |
46 | fi | 36 | FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*" |
47 | } | 37 | FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \ |
38 | ${prefix}/${TARGET_SYS}/lib/libmudflap*.a" | ||