[oe-commits] org.oe.dev gcc-cross-3.3.3: Use gcc-package-cross.inc

[rpurdie commit]

gcc-cross-3.3.3: Use gcc-package-cross.inc

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 238af2a04ccb57a85da14ef3a63fa7baf9f15a2c
ViewMTN: http://monotone.openembedded.org/revision/info/238af2a04ccb57a85da14ef3a63fa7baf9f15a2c
Files:
1
packages/gcc/gcc-cross_3.3.3.bb
Diffs:

#
# mt diff -ra627461704e72d00bef32cc569323e7fa66dc727 -r238af2a04ccb57a85da14ef3a63fa7baf9f15a2c
#
#
#
# patch "packages/gcc/gcc-cross_3.3.3.bb"
#  from [8a0e110565b535ecfafa2046bae44016fbe8e61b]
#    to [cd55cc247070dca4f99b30caea8ba6b1dd02fefb]
#
============================================================
--- packages/gcc/gcc-cross_3.3.3.bb	8a0e110565b535ecfafa2046bae44016fbe8e61b
+++ packages/gcc/gcc-cross_3.3.3.bb	cd55cc247070dca4f99b30caea8ba6b1dd02fefb
@@ -2,15 +2,9 @@ require gcc-package-target.inc
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-inherit cross
+require gcc-cross.inc
+require gcc-package-cross.inc
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-# Files for these are defined in the main gcc.oe
-PACKAGES = "libgcc libstdc++ libg2c"
-INHIBIT_PACKAGE_STRIP = "1"
-
 EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
 		--with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
 
@@ -61,34 +55,3 @@ do_stage_append () {
 	# We don't really need to keep this around
 	rm -rf ${CROSS_DIR}/share
 }
-
-python do_package() {
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libgcc', 'libgcc1', d)
-	bb.build.exec_func('package_do_package', d)
-}
-
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${base_libdir}
-	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
-		# native builds drop one pathname component
-		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
-	else
-		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
-	fi
-
-	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
-	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}${TGT_LIBDIR}
-	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
-	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
-
-	# Manually run the target stripper since we won't get it run by
-	# the packaging.
-	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
-	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
-	${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
-}