summaryrefslogtreecommitdiff
path: root/packages/gcc
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-11-26 14:27:38 +0000
committerKoen Kooi <koen@openembedded.org>2006-11-26 14:27:38 +0000
commite24a03968e1d992d6ef884b51863496f5168ad9e (patch)
treeafc0cdc4af53127d33fb2cc2531c17efc6b54721 /packages/gcc
parent91af666405b0d5796827781c6237f2dded0577bc (diff)
gcc-cross 4.1.1: fix libg* architecture bugs, closes #1265
Diffstat (limited to 'packages/gcc')
-rw-r--r--packages/gcc/gcc-cross_4.1.1.bb2
-rw-r--r--packages/gcc/gcc-package-cross.inc21
2 files changed, 13 insertions, 10 deletions
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 0e7db43088..2f29e172a3 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r7"
+PR = "r8"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index 71deca3744..dd2703d36c 100644
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -6,13 +6,16 @@ HAS_GFORTRAN ?= "no"
OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
INHIBIT_PACKAGE_STRIP = "1"
+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
+MY_ARCH := "${PACKAGE_ARCH}"
+
PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
-PACKAGE_ARCH_libg2c = "${TARGET_ARCH}"
-PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}"
-PACKAGE_ARCH_libgfortran = "${TARGET_ARCH}"
-PACKAGE_ARCH_libgfortran-dev = "${TARGET_ARCH}"
+PACKAGE_ARCH_libg2c = "${MY_ARCH}"
+PACKAGE_ARCH_libg2c-dev = "${MY_ARCH}"
+PACKAGE_ARCH_libgfortran = "${MY_ARCH}"
+PACKAGE_ARCH_libgfortran-dev = "${MY_ARCH}"
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
@@ -25,13 +28,13 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
${target_libdir}/libgfortran.so \
${target_libdir}/libgfortranbegin.a"
-PACKAGE_ARCH_libgcc = "${TARGET_ARCH}"
-PACKAGE_ARCH_libgcc-dev = "${TARGET_ARCH}"
+PACKAGE_ARCH_libgcc = "${MY_ARCH}"
+PACKAGE_ARCH_libgcc-dev = "${MY_ARCH}"
FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
-PACKAGE_ARCH_libstdc++ = "${TARGET_ARCH}"
-PACKAGE_ARCH_libstdc++-dev = "${TARGET_ARCH}"
+PACKAGE_ARCH_libstdc++ = "${MY_ARCH}"
+PACKAGE_ARCH_libstdc++-dev = "${MY_ARCH}"
FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
${target_libdir}/libstdc++.so \
@@ -64,7 +67,7 @@ do_install () {
mkdir -p ${D}${target_libdir}
mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
if [ "${HAS_G2C}" = "yes" ]; then
- mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir}
+ mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
fi
if [ "${HAS_GFORTRAN}" = "yes" ]; then
mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir}