diff options
| author |   Felix Domke <tmbinc@elitedvb.ne> | 2007-01-15 21:15:26 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.ne> | 2007-01-15 21:15:26 +0000 |
| commit | 1f62cdfb568103265912b3b6fa0ecd1ca56ad942 (patch) | |
| tree | 772c66faa54d503081402ecfb4a36aa00fc03740 /packages/gcc | |
| parent | aa27e4da1f02ad2cbe4e53b40747ef37625d6aa4 (diff) | |
| download | openembedded-1f62cdfb568103265912b3b6fa0ecd1ca56ad942.tar.gz | |
gcc-4.1.1: some workarounds for gcj on mips
Diffstat (limited to 'packages/gcc')
| -rw-r--r-- | packages/gcc/gcc-package-cross.inc | 16 | ||||
| -rw-r--r-- | packages/gcc/gcc_4.1.1.bb | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index ea771a334b..b216aeb349 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -6,14 +6,19 @@ HAS_GFORTRAN ?= "no" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" -PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" -PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*" +PACKAGES = "libgcj libgcj-dev libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" +PACKAGES_DYNAMIC = "libgcj* 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_libgcj = "${TARGET_ARCH}" +FILES_libgcj = "${target_libdir}/libg?j.so.*" +FILES_libgcj-dev = "${target_libdir}/libg?j.so \ + ${target_libdir}/libg?j.a" + # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" FILES_libg2c-dev = "${target_libdir}/libg2c.so \ @@ -58,8 +63,12 @@ do_install () { mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${target_base_libdir} fi - # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr + # Move libstdc++, libg2c and libgcj into libdir (resetting our prefix to /usr mkdir -p ${D}${target_libdir} + if [ -f ${D}${prefix}/*/lib/libgcj.so.? ]; then + mv -f ${D}${prefix}/*/lib/libg?j.so.* ${D}${target_libdir} + mv -f ${D}${prefix}/*/lib/libg?j.a ${D}${target_libdir} + fi 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} @@ -74,5 +83,6 @@ do_install () { ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${target_libdir}/libg?j.so.* fi } diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index e2d3d25ea8..b044f65adf 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -39,9 +39,7 @@ HAS_G2C = "no" #Set the java bits JAVA_arm = "" -LANGUAGES = "c,c++" require gcc3-build.inc - -EXTRA_OECONF += " --disable-libssp " +EXTRA_OECONF += " --disable-libssp --without-x" |