Author: sthibault
Date: 2011-03-29 21:34:10 +0000 (Tue, 29 Mar 2011)
New Revision: 4599
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
glibc-package/branches/eglibc-2.13/debian/patches/series
glibc-package/branches/eglibc-2.13/debian/patches/series.hurd-i386
Log:
patches/hurd-i386/local-add-needed.diff: Use an upstreamable change
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
2011-03-28 21:10:27 UTC (rev 4598)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
2011-03-29 21:34:10 UTC (rev 4599)
@@ -3,13 +3,17 @@
---
Makerules | 1 +
1 file changed, 1 insertion(+)
+diff --git a/Makerules b/Makerules
+index 82ffa1e..8876342 100644
--- a/Makerules
+++ b/Makerules
-@@ -1043,6 +1043,7 @@
- echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
+@@ -991,6 +991,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
- ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' ;\
-+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' ;\
- echo 'INPUT ( AS_NEEDED ( -lpthread-stubs ) )' \
+ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
) > $@.new
++ifeq ($(patsubst gnu%,,$(config-os)),)
++ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new
++endif
mv -f $@.new $@
+
+ endif
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
2011-03-28 21:10:27 UTC (rev 4598)
+++
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_stubs.diff
2011-03-29 21:34:10 UTC (rev 4599)
@@ -17,14 +17,12 @@
--- a/Makerules
+++ b/Makerules
-@@ -1042,7 +1042,8 @@
- cat $<; \
- echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-- ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
-+ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' ;\
-+ echo 'INPUT ( AS_NEEDED ( -lpthread-stubs ) )' \
+@@ -979,6 +979,7 @@
) > $@.new
+ ifeq ($(patsubst gnu%,,$(config-os)),)
+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new
++ echo 'INPUT ( AS_NEEDED ( -lpthread-stubs ) )' >> $@.new
+ endif
mv -f $@.new $@
--- a/sysdeps/mach/hurd/libc-ldscript
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-28
21:10:27 UTC (rev 4598)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-03-29
21:34:10 UTC (rev 4599)
@@ -127,6 +127,7 @@
hurd-i386/cvs-psiginfo.diff
hurd-i386/local-ptsname.diff
hurd-i386/cvs-if_freereq.diff
+hurd-i386/local-add-needed.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series.hurd-i386
2011-03-28 21:10:27 UTC (rev 4598)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series.hurd-i386
2011-03-29 21:34:10 UTC (rev 4599)
@@ -6,4 +6,3 @@
hurd-i386/local-unlockpt-chroot.diff
hurd-i386/local-msg-nosignal.diff
hurd-i386/local-pthread.diff
-hurd-i386/local-add-needed.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q4gye-0006ht...@alioth.debian.org
