[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4600 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/hurd-i386



Author: sthibault
Date: 2011-03-29 22:03:04 +0000 (Tue, 29 Mar 2011)
New Revision: 4600

Added:
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-add-needed.diff
Removed:
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff
Modified:
   glibc-package/branches/eglibc-2.13/debian/changelog
   glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
patches/hurd-i386/local-add-needed.diff submitted upstream

Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-29 21:34:10 UTC (rev 4599)
+++ glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-29 22:03:04 UTC (rev 4600)
@@ -155,7 +155,7 @@
     patches/hurd-i386/cvs-psiginfo.diff, and
     patches/hurd-i386/local-ptsname.diff to fix hurd-i386 build.
   * Update expected hurd-i386 failures with new tests.
-  * Add patches/hurd-i386/local-add-needed.diff to fix getting functions from
+  * Add patches/hurd-i386/submitted-add-needed.diff to fix getting functions from
     libmachuser and libhurduser with gold linking.
 
   [ Steve Langasek ]

Deleted: 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-29 21:34:10 UTC (rev 4599)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff	2011-03-29 22:03:04 UTC (rev 4600)
@@ -1,19 +0,0 @@
-These are not implicit any more with gold.
-
----
- Makerules |    1 +
- 1 file changed, 1 insertion(+)
-diff --git a/Makerules b/Makerules
-index 82ffa1e..8876342 100644
---- a/Makerules
-+++ b/Makerules
-@@ -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) ') )' \
- 	) > $@.new
-+ifeq ($(patsubst gnu%,,$(config-os)),)
-+	echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new
-+endif
- 	mv -f $@.new $@
- 
- endif

Copied: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-add-needed.diff (from rev 4599, glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-add-needed.diff)
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-add-needed.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-add-needed.diff	2011-03-29 22:03:04 UTC (rev 4600)
@@ -0,0 +1,22 @@
+2011-03-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+        * Makerules ($(inst_libdir)/libc.so): Add -lmachuser -lhurduser to
+        libc.so on GNU/Hurd.
+
+---
+ Makerules |    1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/Makerules b/Makerules
+index 82ffa1e..8876342 100644
+--- a/Makerules
++++ b/Makerules
+@@ -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) ') )' \
+ 	) > $@.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/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series	2011-03-29 21:34:10 UTC (rev 4599)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series	2011-03-29 22:03:04 UTC (rev 4600)
@@ -127,7 +127,7 @@
 hurd-i386/cvs-psiginfo.diff
 hurd-i386/local-ptsname.diff
 hurd-i386/cvs-if_freereq.diff
-hurd-i386/local-add-needed.diff
+hurd-i386/submitted-add-needed.diff
 
 ia64/local-dlfptr.diff
 ia64/submitted-sysconf.diff


Reply to: