Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b9adf9aeabcdddf1fe439e41a721d8899461ac0

commit 2b9adf9aeabcdddf1fe439e41a721d8899461ac0
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Sep 7 10:56:59 2011 +0200

glibc-2.14-7-i686

- add glibc2.14-revert-sunrpc-removal.patch, otherwise glibc-2.14 breaks
libtirpc and others

diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index 4b86aeb..fe48fbb 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -11,7 +11,7 @@ USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT}

pkgname=glibc
pkgver=2.14
-pkgrel=6
+pkgrel=7
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html";
depends=()
@@ -28,14 +28,16 @@ 
source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \
revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch \
nis.diff \
glibc-2.14-revert-4462fad3.patch \
-       glibc-2.14-libdl-crash.patch)
+       glibc-2.14-libdl-crash.patch \
+       glibc2.14-revert-sunrpc-removal.patch)
sha1sums=('74a57dd5bd2494a190da7ded31477980aefa5093' \
'be4a7bea8af743331e2c6704faa24b6cb4e155d5' \
'2283966c4f48bbc9b6ad0ae3bbd64601c057c721' \
'c8d14d0f2e239ba0def978010163e919a45700f7' \
'9c4544aee1063f65da39273349f0780d5723747d' \
'42af7bdcfc3edd795d181ce973f6b9278720abfc' \
-          '0cbe39b2fe6e058562e9ac44d54ed539c8416bf7')
+          '0cbe39b2fe6e058562e9ac44d54ed539c8416bf7' \
+         '9e07221a0f200898a680ed8682569606e4d3abbe')

if Fuse GLIBC_PORTS; then
source=("${source[@]}" 
"http://ftp.frugalware.org/pub/other/people/elentir/glibc-ports/glibc-ports-$pkgver.tar.bz2";)
diff --git a/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch 
b/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch
new file mode 100644
index 0000000..52e1823
--- /dev/null
+++ b/source/base/glibc/glibc2.14-revert-sunrpc-removal.patch
@@ -0,0 +1,26 @@
+Index: glibc-2.14/include/libc-symbols.h
+===================================================================
+--- glibc-2.14.orig/include/libc-symbols.h
++++ glibc-2.14/include/libc-symbols.h
+@@ -635,7 +635,7 @@ for linking")
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+Index: glibc-2.14/sunrpc/Makefile
+===================================================================
+--- glibc-2.14.orig/sunrpc/Makefile
++++ glibc-2.14/sunrpc/Makefile
+@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth
+                                   des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+                      $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ install-others = $(inst_sysconfdir)/rpc
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) 
\
+           $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to