summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.1.2.bb2
-rw-r--r--meta/packages/gcc/gcc-package-sdk.inc45
-rw-r--r--meta/packages/gcc/gcc-package.inc4
3 files changed, 21 insertions, 30 deletions
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 305365a143..238f5c2fd0 100644
--- 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 @@
1PR = "r3" 1PR = "r4"
2 2
3inherit sdk 3inherit sdk
4 4
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"
6OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" 6OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
7INHIBIT_PACKAGE_STRIP = "1" 7INHIBIT_PACKAGE_STRIP = "1"
8 8
9
10python do_package() { 9python 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() {
16do_install () { 15do_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 27FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*"
31 mkdir -p ${D}${libdir} 28FILES_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 30FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*"
41 # the packaging. 31FILES_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 36FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*"
47} 37FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \
38 ${prefix}/${TARGET_SYS}/lib/libmudflap*.a"
diff --git a/meta/packages/gcc/gcc-package.inc b/meta/packages/gcc/gcc-package.inc
index 3be1f2f0e0..0d15134c06 100644
--- a/meta/packages/gcc/gcc-package.inc
+++ b/meta/packages/gcc/gcc-package.inc
@@ -1,7 +1,8 @@
1gcclibdir ?= "${libdir}/gcc" 1gcclibdir ?= "${libdir}/gcc"
2BINV ?= "${PV}" 2BINV ?= "${PV}"
3 3
4PACKAGES = "libgcc ${PN} ${PN}-symlinks \ 4PACKAGES = "libgcc libgcc-dev \
5 ${PN} ${PN}-symlinks \
5 g++ g++-symlinks \ 6 g++ g++-symlinks \
6 cpp cpp-symlinks \ 7 cpp cpp-symlinks \
7 g77 g77-symlinks \ 8 g77 g77-symlinks \
@@ -59,7 +60,6 @@ FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
59 60
60FILES_libmudflap = "${libdir}/libmudflap*.so.*" 61FILES_libmudflap = "${libdir}/libmudflap*.so.*"
61FILES_libmudflap-dev = "${libdir}/libmudflap*.so \ 62FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
62 ${libdir}/libmudflap*.a \
63 ${libdir}/libmudflap*.a" 63 ${libdir}/libmudflap*.a"
64 64
65 65