Skip to contentSkip to conversation

uclibc-git: Fix build on x86 and move to latest master

PATCH In review Khem Raj 2 participants 3 messages Mar 26, 2013

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 uclibc-git: Fix build on x86 and move to latest master

debugedit from rpm has unearthed a bug in uclibc
where it was mixing stabs with elf/dwarf

---
 meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
 .../0001-i386-sysdep.h-Remove-STABS_-macros.patch  |   71 ++++
 ...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |    8 +-
 .../uclibc/uclibc-git/posix_fallocate.patch        |  408 --------------------
 .../uclibc/uclibc-git/uclibc-execvpe.patch         |  163 --------
 5 files changed, 77 insertions(+), 578 deletions(-)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch
meta/recipes-core/uclibc/uclibc-git.inc +2 -3
index ed9b5fd..db00ee6 100644
@@ -1,4 +1,4 @@
-SRCREV="9591091f150e8a86c47efbea5def21fa67fffb07"
+SRCREV="946799cd0ce0c6c803c9cb173a84f4d607bde350"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,13 +16,12 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://argp-headers.patch \
 	file://remove_attribute_optimize_Os.patch \
 	file://compile-arm-fork-with-O2.patch \
-	file://uclibc-execvpe.patch \
 	file://orign_path.patch \
-	file://posix_fallocate.patch \
 	file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \
 	file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \
 	file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
 	file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \
 	file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \
+	file://0001-i386-sysdep.h-Remove-STABS_-macros.patch \
 	"
 S = "${WORKDIR}/git"
meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch new file +71 -0

71 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc-git/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch +4 -4
index 407beb6..7fc5bd3 100644
@@ -13,12 +13,12 @@ Upstream-Status: Pending
 
 Index: git/libc/sysdeps/linux/arm/Makefile.arch
 ===================================================================
---- git.orig/libc/sysdeps/linux/arm/Makefile.arch	2013-01-21 16:29:25.000000000 -0800
-+++ git/libc/sysdeps/linux/arm/Makefile.arch	2013-01-21 16:33:11.575571091 -0800
-@@ -12,7 +12,10 @@
- 	bsd-_setjmp.S sigrestorer.S mmap64.S \
+--- git.orig/libc/sysdeps/linux/arm/Makefile.arch	2013-03-25 19:48:48.000000000 -0700
++++ git/libc/sysdeps/linux/arm/Makefile.arch	2013-03-25 19:51:57.496677771 -0700
+@@ -13,7 +13,10 @@
  	vfork.S clone.S
  
+ SSRC-$(UCLIBC_HAS_LFS) += mmap64.S
 -SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-aeabi_read_tp.S libc-thumb_atomics.S
 +SSRC-$(UCLIBC_HAS_THREADS_NATIVE) += libc-thumb_atomics.S
 +libc-nonshared-$(UCLIBC_HAS_THREADS_NATIVE) += $(ARCH_OUT)/libc-aeabi_read_tp.os
meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch deleted +0 -408

408 lines not on this page · raw message

meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch deleted +0 -163

163 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 4 lines · Khem Raj

debugedit from rpm has unearthed a bug in uclibc
where it was mixing stabs with elf/dwarf

Quoted 10 lines
---
 meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
 .../0001-i386-sysdep.h-Remove-STABS_-macros.patch  |   71 ++++
 ...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |    8 +-
 .../uclibc/uclibc-git/posix_fallocate.patch        |  408 --------------------
 .../uclibc/uclibc-git/uclibc-execvpe.patch         |  163 --------
 5 files changed, 77 insertions(+), 578 deletions(-)
 create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch
 delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch

git am really doesn't like applying this, is there a tree I can pull it from somewhere?

Cheers,

Richard

author
#2 lore raw
Quoted 16 lines · Richard Purdie
Quoted 11 lines · Khem Raj

debugedit from rpm has unearthed a bug in uclibc
where it was mixing stabs with elf/dwarf

---

meta/recipes-core/uclibc/uclibc-git.inc            |    5 +-
.../0001-i386-sysdep.h-Remove-STABS_-macros.patch  |   71 ++++
...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |    8 +-
.../uclibc/uclibc-git/posix_fallocate.patch        |  408 --------------------
.../uclibc/uclibc-git/uclibc-execvpe.patch         |  163 --------
5 files changed, 77 insertions(+), 578 deletions(-)
Quoted 3 lines

create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-i386-sysdep.h-Remove-STABS_-macros.patch delete mode 100644 meta/recipes-core/uclibc/uclibc-git/posix_fallocate.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc-execvpe.patch

Quoted 3 lines

git am really doesn't like applying this, is there a tree I can pull it from somewhere?

OK pushed to a branch

git://git.openembedded.org/openembedded-core-contrib kraj/uclibc-upgrade

Quoted 4 lines

Cheers,

Richard