[oe-commits] org.oe.dev merge of '84534f67cba0a9730d36b935b879e535f187b38d'

[rpurdie commit]

merge of '84534f67cba0a9730d36b935b879e535f187b38d'
     and 'ceb8dd6449d4803228f8cbdf49c91c7c26fb5760'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 4cb57a7e78a706388906290afb6ab438e669072a
ViewMTN: http://monotone.openembedded.org/revision/info/4cb57a7e78a706388906290afb6ab438e669072a
Files:
1
packages/xorg-proto/inputproto_1.4.3.bb
packages/xorg-proto/printproto_1.0.4.bb
packages/xorg-util/util-macros_1.1.6.bb
packages/gcc/gcc-cross-initial_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm.bb
packages/gcc/gcc-csl-arm-cvs.inc
packages/gcc/gcc-csl-arm.inc
packages/gcc/gcc_csl-arm-cvs.bb
packages/gcc/gcc_csl-arm.bb
packages/gcc/gcc-4.2.2.inc
packages/gcc/gcc-cross_3.3.3.bb
packages/gcc/gcc_4.2.2.bb
Diffs:

#
# mt diff -r84534f67cba0a9730d36b935b879e535f187b38d -r4cb57a7e78a706388906290afb6ab438e669072a
#
#
#
# add_file "packages/xorg-proto/inputproto_1.4.3.bb"
#  content [a2700c4f70667f3d8d5d1a838644f2a4bf6a2416]
# 
# add_file "packages/xorg-proto/printproto_1.0.4.bb"
#  content [a2700c4f70667f3d8d5d1a838644f2a4bf6a2416]
# 
# add_file "packages/xorg-util/util-macros_1.1.6.bb"
#  content [9dd3c08d7715e6e845ab141fd67cbb4e3a962977]
#
============================================================
--- packages/xorg-proto/inputproto_1.4.3.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
+++ packages/xorg-proto/inputproto_1.4.3.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
@@ -0,0 +1,3 @@
+require xorg-proto-common.inc
+
+PE = "1"
============================================================
--- packages/xorg-proto/printproto_1.0.4.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
+++ packages/xorg-proto/printproto_1.0.4.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
@@ -0,0 +1,3 @@
+require xorg-proto-common.inc
+
+PE = "1"
============================================================
--- packages/xorg-util/util-macros_1.1.6.bb	9dd3c08d7715e6e845ab141fd67cbb4e3a962977
+++ packages/xorg-util/util-macros_1.1.6.bb	9dd3c08d7715e6e845ab141fd67cbb4e3a962977
@@ -0,0 +1,4 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+PE = "1"


#
# mt diff -rceb8dd6449d4803228f8cbdf49c91c7c26fb5760 -r4cb57a7e78a706388906290afb6ab438e669072a
#
#
#
# delete "packages/gcc/gcc-cross-initial_csl-arm-cvs.bb"
# 
# delete "packages/gcc/gcc-cross_csl-arm-cvs.bb"
# 
# delete "packages/gcc/gcc-cross_csl-arm.bb"
# 
# delete "packages/gcc/gcc-csl-arm-cvs.inc"
# 
# delete "packages/gcc/gcc-csl-arm.inc"
# 
# delete "packages/gcc/gcc_csl-arm-cvs.bb"
# 
# delete "packages/gcc/gcc_csl-arm.bb"
# 
# patch "packages/gcc/gcc-4.2.2.inc"
#  from [53337ebeeae40f12bc9688296c20c72a7b316d7c]
#    to [13e6aba7d5ee47a5289255ca43b3892e63cf0ebd]
# 
# patch "packages/gcc/gcc-cross_3.3.3.bb"
#  from [8a0e110565b535ecfafa2046bae44016fbe8e61b]
#    to [38620c97f258fcf7a106d748386c80999510aebe]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [42d5c902e1d49069638f74263bf71864be52f3c5]
#    to [f29bf48a3d25ed2aca4c7a48402687e66a222580]
#
============================================================
--- packages/gcc/gcc-4.2.2.inc	53337ebeeae40f12bc9688296c20c72a7b316d7c
+++ packages/gcc/gcc-4.2.2.inc	13e6aba7d5ee47a5289255ca43b3892e63cf0ebd
@@ -77,12 +77,5 @@ ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_
 require gcc3-build.inc
 ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR}
 
-
 EXTRA_OECONF += " --disable-libssp --disable-bootstrap "
 
-# We know some one is including us, but we only want to apply this fortran hack for the real gcc
-python __anonymous () {
-    import bb
-    if bb.data.getVar('PN', d, True) == "gcc":
-        bb.data.setVar('SRC_URI_append', ' file://fortran-cross-compile-hack.patch;patch=1', d)
-}
============================================================
--- packages/gcc/gcc-cross_3.3.3.bb	8a0e110565b535ecfafa2046bae44016fbe8e61b
+++ packages/gcc/gcc-cross_3.3.3.bb	38620c97f258fcf7a106d748386c80999510aebe
@@ -1,16 +1,9 @@ require gcc-${PV}.inc
 PR = "r3"
 
 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 +54,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.*
-}
============================================================
--- packages/gcc/gcc_4.2.2.bb	42d5c902e1d49069638f74263bf71864be52f3c5
+++ packages/gcc/gcc_4.2.2.bb	f29bf48a3d25ed2aca4c7a48402687e66a222580
@@ -2,3 +2,6 @@ require gcc-package-target.inc
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
+
+SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
+