summaryrefslogtreecommitdiff
path: root/packages/uclibc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2008-12-18 16:49:09 -0800
committerKhem Raj <raj.khem@gmail.com>2008-12-18 16:49:09 -0800
commit8fa2930ee67b8f6369a1c01be9221e2759d0d62c (patch)
tree913c3aa7a16ce694044ba6eda2b945df65122433 /packages/uclibc
parent898a0032297407105b16e07d8f300cdce1b17e4c (diff)
uclibc-0.9.30: Update ldso_hash.patch so we do not ignore LDFLAGS_GNUHASH assignment
uclibc-nptl: Ditto uclibc-svn: Ditto
Diffstat (limited to 'packages/uclibc')
-rw-r--r--packages/uclibc/uclibc-0.9.30/ldso_hash.patch25
-rw-r--r--packages/uclibc/uclibc-nptl/ldso_hash.patch25
-rw-r--r--packages/uclibc/uclibc-svn/ldso_hash.patch25
-rw-r--r--packages/uclibc/uclibc_0.9.30.bb2
4 files changed, 31 insertions, 46 deletions
diff --git a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch b/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
index 8a625f21c2..974f564396 100644
--- a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
+++ b/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
@@ -1,19 +1,14 @@
-Index: uClibc-0.9.30/Rules.mak
+Index: uClibc-nptl/Rules.mak
===================================================================
---- uClibc-0.9.30.orig/Rules.mak 2008-11-15 16:35:00.713664783 +0100
-+++ uClibc-0.9.30/Rules.mak 2008-11-15 16:36:32.776988120 +0100
-@@ -519,13 +519,7 @@
- endif
+--- 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
+ # Be sure that binutils support it
-LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
--ifeq ($(LDFLAGS_GNUHASH),)
--$(error Your binutils don't support --hash-style option, while you want to use it)
--else
--LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
--endif
-+LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
- endif
-
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
++#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-nptl/ldso_hash.patch b/packages/uclibc/uclibc-nptl/ldso_hash.patch
index 8a625f21c2..974f564396 100644
--- a/packages/uclibc/uclibc-nptl/ldso_hash.patch
+++ b/packages/uclibc/uclibc-nptl/ldso_hash.patch
@@ -1,19 +1,14 @@
-Index: uClibc-0.9.30/Rules.mak
+Index: uClibc-nptl/Rules.mak
===================================================================
---- uClibc-0.9.30.orig/Rules.mak 2008-11-15 16:35:00.713664783 +0100
-+++ uClibc-0.9.30/Rules.mak 2008-11-15 16:36:32.776988120 +0100
-@@ -519,13 +519,7 @@
- endif
+--- 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
+ # Be sure that binutils support it
-LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
--ifeq ($(LDFLAGS_GNUHASH),)
--$(error Your binutils don't support --hash-style option, while you want to use it)
--else
--LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
--endif
-+LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
- endif
-
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
++#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-svn/ldso_hash.patch b/packages/uclibc/uclibc-svn/ldso_hash.patch
index 8a625f21c2..974f564396 100644
--- a/packages/uclibc/uclibc-svn/ldso_hash.patch
+++ b/packages/uclibc/uclibc-svn/ldso_hash.patch
@@ -1,19 +1,14 @@
-Index: uClibc-0.9.30/Rules.mak
+Index: uClibc-nptl/Rules.mak
===================================================================
---- uClibc-0.9.30.orig/Rules.mak 2008-11-15 16:35:00.713664783 +0100
-+++ uClibc-0.9.30/Rules.mak 2008-11-15 16:36:32.776988120 +0100
-@@ -519,13 +519,7 @@
- endif
+--- 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
+ # Be sure that binutils support it
-LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
--ifeq ($(LDFLAGS_GNUHASH),)
--$(error Your binutils don't support --hash-style option, while you want to use it)
--else
--LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
--endif
-+LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
- endif
-
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
++#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 e3155f30fa..16e18fba97 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 = "r2"
+PR = "r3"
DEFAULT_PREFERENCE = "1"
require uclibc.inc