Author: sthibault
Date: 2011-04-21 10:22:03 +0000 (Thu, 21 Apr 2011)
New Revision: 4609

Modified:
   glibc-package/branches/eglibc-2.13/debian/changelog
   
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
Log:
Add defining LIBPTHREAD_VERSION to
patches/hurd-i386/local-pthread_posix-option.diff


Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-04-17 20:28:30 UTC 
(rev 4608)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-04-21 10:22:03 UTC 
(rev 4609)
@@ -163,6 +163,8 @@
     from libmachuser and libhurduser with gold linking.
   * Add patches/hurd-i386/local-ED.diff to avoid letting the
     (standard-compliant!) prank bring FTBFSes.
+  * Add defining LIBPTHREAD_VERSION to
+    patches/hurd-i386/local-pthread_posix-option.diff
 
   [ Steve Langasek ]
   * Set Multi-Arch: foreign on the appropriate packages.

Modified: 
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
===================================================================
--- 
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
 2011-04-17 20:28:30 UTC (rev 4608)
+++ 
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
 2011-04-21 10:22:03 UTC (rev 4609)
@@ -1,5 +1,5 @@
 Even if glibc doesn't have an integrated pthread library, it depends on the 
hurd
-packages which have a pthread library.
+packages which have a pthread library, so we should provide all the defines 
etc.
 
 Avoid letting glibc try to install its own headers for libpthread.
 
@@ -109,6 +109,21 @@
 +      true
 +
 ++force =
+diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
+index 482b6ba..0e5bc08 100644
+--- a/sysdeps/mach/hurd/Makefile
++++ b/sysdeps/mach/hurd/Makefile
+@@ -212,6 +212,10 @@ shared-only-routines += unwind-resume
+ CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
+ endif
+ 
++ifeq ($(subdir),posix)
++CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"libpthread 0.3"'
++endif
++
+ ifeq ($(subdir),rt)
+ librt-sysdep_routines += rt-unwind-resume
+ librt-shared-only-routines += rt-unwind-resume
 --- /dev/null
 +++ b/sysdeps/mach/hurd/gai_misc.h
 @@ -0,0 +1,43 @@


-- 
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/e1qcr1w-0004my...@alioth.debian.org

Reply via email to