[oe-commits] org.oe.dev merge of '0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:32:12 UTC 2007 

merge of '0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb'
     and 'd06fd2cd0014c2f9c2fa5c5046bfbb73145ca6e5'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 013c9a6736103814cf89a1574dfe2565f15bd752
ViewMTN: http://monotone.openembedded.org/revision.psp?id=013c9a6736103814cf89a1574dfe2565f15bd752
Files:
1
packages/glib-2.0/glib-2.0-2.12.11
packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch
packages/glib-2.0/glib-2.0_2.12.11.bb
classes/insane.bbclass
conf/distro/angstrom-2007.1.conf
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
Diffs:

#
# mt diff -r0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb -r013c9a6736103814cf89a1574dfe2565f15bd752
#
# 
# 
# add_dir "packages/glib-2.0/glib-2.0-2.12.11"
# 
# add_file "packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch"
#  content [9b44953a371e1457442ffa48d9d3fb650e9d87c9]
# 
# add_file "packages/glib-2.0/glib-2.0_2.12.11.bb"
#  content [15b70f63f7570c7f05487f7c86d69f5b9a145936]
# 
# patch "classes/insane.bbclass"
#  from [45a00cd8ba103689d472c4aa0d08c8f71c08b5ad]
#    to [569bf170b79d705c3b8ee57453b13386b20bd586]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [fbe7060a08d6f32d966998ff6985714ec68764e8]
#    to [472920415ab6c714130b6937c146b8991f7bc66c]
# 
# patch "packages/meta/meta-sdk-sbox.bb"
#  from [6e24d2ccdd6e99d6c9f698f0f2cdba71f152249a]
#    to [d0b57e5da143f0c475c773c1be14324cab68678c]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [b7a259b8024130e4d0d3c2d658ba7fa78ec2fa14]
#    to [619a355b6df8c86f32b7018b95a6279ae910bc50]
# 
============================================================
--- packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch	9b44953a371e1457442ffa48d9d3fb650e9d87c9
+++ packages/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch	9b44953a371e1457442ffa48d9d3fb650e9d87c9
@@ -0,0 +1,20 @@
+--- /tmp/configure.in	2007-02-04 12:07:05.000000000 +0100
++++ glib-2.12.9/configure.in	2007-02-04 12:08:04.655251000 +0100
+@@ -1174,7 +1174,7 @@
+   G_MODULE_LDFLAGS=
+ else
+   export SED
+-  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++  G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1239,7 +1239,7 @@
+ 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ 	echo "void glib_plugin_test(void) { }" > plugin.c
+-	${SHELL} ./libtool --mode=compile ${CC} -shared \
++	${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ 		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ 	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ 		glib_cv_rtldglobal_broken,[
============================================================
--- packages/glib-2.0/glib-2.0_2.12.11.bb	15b70f63f7570c7f05487f7c86d69f5b9a145936
+++ packages/glib-2.0/glib-2.0_2.12.11.bb	15b70f63f7570c7f05487f7c86d69f5b9a145936
@@ -0,0 +1,6 @@
+require glib.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
+           file://glibconfig-sysdefs.h \
+           file://configure-libtool.patch;patch=1"
+
============================================================
--- classes/insane.bbclass	45a00cd8ba103689d472c4aa0d08c8f71c08b5ad
+++ classes/insane.bbclass	569bf170b79d705c3b8ee57453b13386b20bd586
@@ -255,6 +255,10 @@ def package_qa_check_arch(path,name,d):
     import bb, os
     target_os   = bb.data.getVar('TARGET_OS',   d, True)
     target_arch = bb.data.getVar('TARGET_ARCH', d, True)
+  
+    # FIXME: Cross package confuse this check, so just skip them
+    if bb.data.inherits_class('cross', d):
+        return True
 
     # avoid following links to /usr/bin (e.g. on udev builds)
     # we will check the files pointed to anyway...
============================================================
--- conf/distro/angstrom-2007.1.conf	fbe7060a08d6f32d966998ff6985714ec68764e8
+++ conf/distro/angstrom-2007.1.conf	472920415ab6c714130b6937c146b8991f7bc66c
@@ -8,7 +8,7 @@ DISTRO_VERSION = "test-${DATE}"
 
 #DISTRO_VERSION = "2007.4"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "40"
+DISTRO_REVISION = "41"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -133,7 +133,7 @@ PREFERRED_VERSION_cairo = "1.4.2"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.2"
-PREFERRED_VERSION_glib-2.0 = "2.12.10"
+PREFERRED_VERSION_glib-2.0 = "2.12.11"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -198,7 +198,7 @@ PREFERRED_VERSION_gcc ?= "4.1.2"
 
 #use EABI toolchain
 PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
 
============================================================
--- packages/meta/meta-sdk-sbox.bb	6e24d2ccdd6e99d6c9f698f0f2cdba71f152249a
+++ packages/meta/meta-sdk-sbox.bb	d0b57e5da143f0c475c773c1be14324cab68678c
@@ -1,7 +1,7 @@ PACKAGES = ""
 DESCRIPTION = "Meta package for a Scratchbox SDK"
 LICENSE = "MIT"
 PACKAGES = ""
-PR = "r4"
+PR = "r5"
 
 inherit rootfs_ipk sdk meta
 
@@ -16,10 +16,7 @@ TARGET_INSTALL = "\
 TARGET_INSTALL = "\
     task-sdk-base \
     task-sdk-sbox \
-    task-sdk-x11 \
-    task-sdk-x11-ext \
-    task-sdk-gpe \
-    task-sdk-gpephone"
+    "
 
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 RDEPENDS = "${TARGET_INSTALL}"
============================================================
--- packages/meta/meta-sdk.bb	b7a259b8024130e4d0d3c2d658ba7fa78ec2fa14
+++ packages/meta/meta-sdk.bb	619a355b6df8c86f32b7018b95a6279ae910bc50
@@ -1,7 +1,7 @@ DEPENDS = "ipkg-native ipkg-utils-native
 DESCRIPTION = "Meta package for SDK including GPE and Opie"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r11"
+PR = "r12"
 
 inherit sdk meta
 
@@ -19,10 +19,7 @@ TARGET_INSTALL = "\
 
 TARGET_INSTALL = "\
     task-sdk-base \
-    task-sdk-opie \
-    task-sdk-x11 \
-    task-sdk-x11-ext \
-    task-sdk-gpe"
+    "
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
@@ -73,22 +70,22 @@ EOF
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
 	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
 	# remove unwanted executables
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
 	# remove broken .la files
-	rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+	rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la
 
 	# fix pkgconfig data files
-	cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+	cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
 	for f in *.pc ; do
-		sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+		sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
 	done
 	for f in *.pc ; do
-		sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
 	done
 
         mkdir -p ${SDK_DEPLOY}


#
# mt diff -rd06fd2cd0014c2f9c2fa5c5046bfbb73145ca6e5 -r013c9a6736103814cf89a1574dfe2565f15bd752
#
# 
# no changes
#

More information about the Openembedded-commits mailing list