diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-01-02 15:10:19 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-01-02 15:10:19 -0800 |
| commit | 23b5bcb59d1206167303a4cb242a2ae34bdbec41 (patch) | |
| tree | 1a2d8880595b742eb1d86c660de0ed8923f87fad /packages/uclibc | |
| parent | ece69b17813dd32aca233019892859a5ce1baf91 (diff) | |
uclibc_0.9.30: Remove ldso_hash patch
uclibc_nptl.bb: Ditto
uclibc_svn.bb: Ditto
Diffstat (limited to 'packages/uclibc')
| -rw-r--r-- | packages/uclibc/uclibc-0.9.30/ldso_hash.patch | 14 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.30.bb | 5 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_nptl.bb | 2 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_svn.bb | 3 |
4 files changed, 1 insertions, 23 deletions
diff --git a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch b/packages/uclibc/uclibc-0.9.30/ldso_hash.patch deleted file mode 100644 index 974f564396..0000000000 --- a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: uClibc-nptl/Rules.mak -=================================================================== ---- uClibc-nptl/Rules.mak (revision 24450) -+++ uClibc-nptl/Rules.mak (working copy) -@@ -522,7 +522,8 @@ - - ifeq ($(LDSO_GNU_HASH_SUPPORT),y) - # Be sure that binutils support it --LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu) -+#LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu) -+LDFLAGS_GNUHASH:=--hash-style=gnu - ifeq ($(LDFLAGS_GNUHASH),) - $(error Your binutils don't support --hash-style option, while you want to use it) - else diff --git a/packages/uclibc/uclibc_0.9.30.bb b/packages/uclibc/uclibc_0.9.30.bb index 16e18fba97..7420c47cfc 100644 --- a/packages/uclibc/uclibc_0.9.30.bb +++ b/packages/uclibc/uclibc_0.9.30.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -18,9 +18,6 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://arm-linuxthreads.patch;patch=1 \ file://linuxthreads-changes.patch;patch=1 \ " -SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " - #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb index d261b50b5b..a43a3dfacd 100644 --- a/packages/uclibc/uclibc_nptl.bb +++ b/packages/uclibc/uclibc_nptl.bb @@ -31,7 +31,5 @@ SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl;rev=${SRCREV} \ file://uclibc-arm-ftruncate64.patch;patch=1 \ file://arm_fix_alignment.patch;patch=1 \ " -SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " S = "${WORKDIR}/uClibc-nptl" diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 080ca60c6d..893c97db13 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -34,7 +34,4 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://linuxthreads-changes.patch;patch=1 \ file://uclibc_enable_log2_test.patch;patch=1 \ " -SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " - S = "${WORKDIR}/uClibc" |