[oe-commits] org.oe.dev Fix eglibc to make it build using OABI.

khem commit oe at amethyst.openembedded.net
Mon Apr 7 00:05:36 UTC 2008 

Fix eglibc to make it build using OABI.
Bring up to latest stable svn revision.
Fix unused global variable problem in eglibc-package.bbclass.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: ac891e557582299a2c482837fc1a4741608997eb
ViewMTN: http://monotone.openembedded.org/revision/info/ac891e557582299a2c482837fc1a4741608997eb
Files:
1
packages/glibc/eglibc-svn
packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch
conf/distro/include/sane-srcrevs.inc
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
Diffs:

#
# mt diff -r8543a70133345bb92a03e0e62346e35801010489 -rac891e557582299a2c482837fc1a4741608997eb
#
#
#
# add_dir "packages/glibc/eglibc-svn"
# 
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch"
#  content [99f1fa805a8dd4fff6c855278522ec939133e165]
# 
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch"
#  content [1dfede10378a1ae0075c2d3ecb4f2168f404e26f]
# 
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch"
#  content [7cce450fd367e820f4d68eba75bcc536c3ac8a0f]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6ff9f0304e5d4462c4374384fd4e7eba9fda15a6]
#    to [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
# 
# patch "packages/glibc/eglibc-package.bbclass"
#  from [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#    to [aee684fa0a585cebef668deddd667baf05049150]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [1328dce82f5660e9a4ffa188f48b4f362872208a]
#    to [f2d383f4c663c6f813536d55ba3fe9371d7e5bd7]
#
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch	99f1fa805a8dd4fff6c855278522ec939133e165
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch	99f1fa805a8dd4fff6c855278522ec939133e165
@@ -0,0 +1,12 @@
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.org	2008-04-04 18:44:53.000000000 -0700
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h	2008-04-04 18:45:27.000000000 -0700
+@@ -73,6 +73,9 @@
+ # define DOCARGS_5	DOCARGS_4
+ # define UNDOCARGS_5	UNDOCARGS_4
+ 
++# define DOCARGS_6	DOCARGS_5
++# define UNDOCARGS_6	UNDOCARGS_5
++
+ # ifdef IS_IN_libpthread
+ #  define CENABLE	bl PLTJMP(__pthread_enable_asynccancel)
+ #  define CDISABLE	bl PLTJMP(__pthread_disable_asynccancel)
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch	1dfede10378a1ae0075c2d3ecb4f2168f404e26f
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch	1dfede10378a1ae0075c2d3ecb4f2168f404e26f
@@ -0,0 +1,21 @@
+Index: eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c	(revision 5790)
++++ eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c	(working copy)
+@@ -200,16 +200,12 @@
+ 		    }
+ 
+ 		  if (ifam->ifa_flags & (IFA_F_DEPRECATED
+-					 | IFA_F_TEMPORARY
+ 					 | IFA_F_HOMEADDRESS))
+ 		    {
+ 		      struct in6ailist *newp = alloca (sizeof (*newp));
+ 		      newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+ 					   ? in6ai_deprecated : 0)
+ 					  | ((ifam->ifa_flags
+-					      & IFA_F_TEMPORARY)
+-					     ? in6ai_temporary : 0)
+-					  | ((ifam->ifa_flags
+ 					      & IFA_F_HOMEADDRESS)
+ 					     ? in6ai_homeaddress : 0));
+ 		      memcpy (newp->info.addr, address ?: local,
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch	7cce450fd367e820f4d68eba75bcc536c3ac8a0f
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch	7cce450fd367e820f4d68eba75bcc536c3ac8a0f
@@ -0,0 +1,19 @@
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
+make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
+
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+ 
+ #define FUTEX_WAIT		0
+ #define FUTEX_WAKE		1
============================================================
--- conf/distro/include/sane-srcrevs.inc	6ff9f0304e5d4462c4374384fd4e7eba9fda15a6
+++ conf/distro/include/sane-srcrevs.inc	7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
@@ -22,9 +22,9 @@ SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-diversity-daemon ?= "127"
 SRCREV_pn-diversity-nav ?= "238"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "5522"
-SRCREV_pn-eglibc-initial ?= "5522"
-SRCREV_pn-eglibc-intermediate ?= "5522"
+SRCREV_pn-eglibc ?= "5790"
+SRCREV_pn-eglibc-initial ?= "5790"
+SRCREV_pn-eglibc-intermediate ?= "5790"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
============================================================
--- packages/glibc/eglibc-package.bbclass	707f3f7fec8dba48bff09a80fe93f4d753d0ae20
+++ packages/glibc/eglibc-package.bbclass	aee684fa0a585cebef668deddd667baf05049150
@@ -262,7 +262,7 @@ python package_do_split_gconvs () {
 		else:
 			eglibc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
-		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % eglibc_name, d)
 		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
 		m = re.match("(.*)_(.*)", name)
 		if m:
============================================================
--- packages/glibc/eglibc_svn.bb	1328dce82f5660e9a4ffa188f48b4f362872208a
+++ packages/glibc/eglibc_svn.bb	f2d383f4c663c6f813536d55ba3fe9371d7e5bd7
@@ -5,6 +5,9 @@ SRC_URI = "svn://svn.eglibc.org;module=t
 PV = "2.7+svnr${SRCREV}"
 PR = "r4"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
+           file://eglibc-svn-arm-cargs6.patch;patch=1 \
+           file://eglibc-svn-arm-check_pf.patch;patch=1 \
+           file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/trunk/libc"
@@ -48,8 +51,13 @@ EXTRA_OECONF += "${@get_eglibc_fpu_setti
 
 EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
 
-do_configure_prepend() {
+do_unpack_append() {
+	bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
         if test -d ${WORKDIR}/trunk/ports ; then
+	    rm -rf ${S}/ports
 	    mv ${WORKDIR}/trunk/ports ${S}/
 	fi    
 }

More information about the Openembedded-commits mailing list