r3265 - in glibc-package/branches/glibc-2.9/debian: . patches patches/hurd-i386
Author: sthibaul-guest
Date: 2009-01-30 01:50:32 +0000 (Fri, 30 Jan 2009)
New Revision: 3265
Added:
glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-dl-sysdep.diff
Modified:
glibc-package/branches/glibc-2.9/debian/changelog
glibc-package/branches/glibc-2.9/debian/patches/series
Log:
* hurd-i386/submitted-dl-sysdep.diff: new patch to fix static linking.
Modified: glibc-package/branches/glibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.9/debian/changelog 2009-01-29 15:48:09 UTC (rev 3264)
+++ glibc-package/branches/glibc-2.9/debian/changelog 2009-01-30 01:50:32 UTC (rev 3265)
@@ -110,6 +110,7 @@
__check_native() function.
* hurd-i386/cvs-get_pc_thunk.diff: new patch to fix missing
__i686.get_pc_thunk.bx reference.
+ * hurd-i386/submitted-dl-sysdep.diff: new patch to fix static linking.
-- Aurelien Jarno <aurel32@debian.org> Thu, 29 Jan 2009 16:47:14 +0100
Added: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-dl-sysdep.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-dl-sysdep.diff (rev 0)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-dl-sysdep.diff 2009-01-30 01:50:32 UTC (rev 3265)
@@ -0,0 +1,26 @@
+2009-01-31 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/dl-sysdep.c: Include code only #ifdef SHARED.
+
+Index: sysdeps/mach/hurd/dl-sysdep.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dl-sysdep.c,v
+retrieving revision 1.79
+diff -u -p -r1.79 dl-sysdep.c
+--- glibc/sysdeps/mach/hurd/dl-sysdep.c 2 Jul 2008 19:34:58 -0000 1.79
++++ glibc/sysdeps/mach/hurd/dl-sysdep.c 30 Jan 2009 00:56:56 -0000
+@@ -42,6 +42,8 @@
+ #include <dl-machine.h>
+ #include <dl-procinfo.h>
+
++#ifdef SHARED
++
+ extern void __mach_init (void);
+
+ extern int _dl_argc;
+@@ -668,3 +670,5 @@ _dl_init_first (int argc, ...)
+ {
+ /* This no-op definition only gets used if libc is not linked in. */
+ }
++
++#endif /* SHARED */
Modified: glibc-package/branches/glibc-2.9/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/series 2009-01-29 15:48:09 UTC (rev 3264)
+++ glibc-package/branches/glibc-2.9/debian/patches/series 2009-01-30 01:50:32 UTC (rev 3265)
@@ -93,6 +93,7 @@
hurd-i386/local-pthread_posix-option.diff
hurd-i386/local-check_native.diff
hurd-i386/cvs-get_pc_thunk.diff
+hurd-i386/submitted-dl-sysdep.diff
i386/local-biarch.diff
i386/local-clone.diff
Reply to: