[oe-commits] org.oe.dreambox gcc-4.1.1: some workarounds for gcj on mips

[tmbinc commit]

gcc-4.1.1: some workarounds for gcj on mips

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 8893820b0bc68729de16e37ddca4e61bd3e738a9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8893820b0bc68729de16e37ddca4e61bd3e738a9
Files:
1
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc_4.1.1.bb
Diffs:

#
# mt diff -rf537887f72e6c5d91b18b7bbfe911de781f61f94 -r8893820b0bc68729de16e37ddca4e61bd3e738a9
#
# 
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee]
#    to [03d085c76389195072f159554414e4bb858a747c]
# 
# patch "packages/gcc/gcc_4.1.1.bb"
#  from [30ac1bd0daf29b64bc91545eb6103b9c13e7d2f8]
#    to [c324d985420309703c84acaa48c06bf6e2cf6b2c]
# 
============================================================
--- packages/gcc/gcc-package-cross.inc	49c1534f66e5c4a0e16b19d43607b9bd8c5a34ee
+++ packages/gcc/gcc-package-cross.inc	03d085c76389195072f159554414e4bb858a747c
@@ -6,14 +6,19 @@ INHIBIT_PACKAGE_STRIP = "1"
 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
 }
============================================================
--- packages/gcc/gcc_4.1.1.bb	30ac1bd0daf29b64bc91545eb6103b9c13e7d2f8
+++ packages/gcc/gcc_4.1.1.bb	c324d985420309703c84acaa48c06bf6e2cf6b2c
@@ -39,9 +39,7 @@ JAVA_arm = ""  
 #Set the java bits
 JAVA_arm = ""  
 
-LANGUAGES = "c,c++"
 require gcc3-build.inc
 
-
-EXTRA_OECONF += " --disable-libssp "
+EXTRA_OECONF += " --disable-libssp --without-x"