summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gcc/gcc-package-cross.inc16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 1ea15c2133..d9fe3bef4f 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -6,7 +6,8 @@ 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
9PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" 9PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
10PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
10 11
11# Called from within gcc-cross, so libdir is set wrong 12# Called from within gcc-cross, so libdir is set wrong
12FILES_libg2c = "${target_libdir}/libg2c.so.*" 13FILES_libg2c = "${target_libdir}/libg2c.so.*"
@@ -20,6 +21,7 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
20 ${target_libdir}/libgfortranbegin.a" 21 ${target_libdir}/libgfortranbegin.a"
21 22
22FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" 23FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
24FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
23 25
24FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" 26FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
25FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \ 27FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
@@ -44,26 +46,26 @@ do_install () {
44 # Already in the right location 46 # Already in the right location
45 : 47 :
46 elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then 48 elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
47 mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${target_base_libdir} 49 mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir}
48 else 50 else
49 mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${target_base_libdir} 51 mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir}
50 fi 52 fi
51 53
52 # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr 54 # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
53 mkdir -p ${D}${target_libdir} 55 mkdir -p ${D}${target_libdir}
54 mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${target_libdir} 56 mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
55 if [ "${HAS_G2C}" = "yes" ]; then 57 if [ "${HAS_G2C}" = "yes" ]; then
56 mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${target_libdir} 58 mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
57 fi 59 fi
58 if [ "${HAS_GFORTRAN}" = "yes" ]; then 60 if [ "${HAS_GFORTRAN}" = "yes" ]; then
59 mv -f ${D}${prefix}/*/lib/libgfortran*.so.* ${D}${target_libdir} 61 mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir}
60 fi 62 fi
61 63
62 # Manually run the target stripper since we won't get it run by 64 # Manually run the target stripper since we won't get it run by
63 # the packaging. 65 # the packaging.
64 if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then 66 if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
65 ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* 67 ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
66 ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* 68 ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
67 ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* 69 ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
68 fi 70 fi
69} 71}