r2955 - in glibc-package/trunk/debian: . control.in patches patches/hurd-i386 sysdeps
Author: sthibaul-guest
Date: 2008-05-26 21:14:33 +0000 (Mon, 26 May 2008)
New Revision: 2955
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-pthread-unsupported-stubs.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series.hurd-i386
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
* patches/hurd-i386/local-pthread-unsupported-stubs.diff: new patch to
declare the unsupported function stubs, fixes compilation of pike. Also
bump the dependency on hurd-dev to get <gnu/stubs-pthread.h>.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-05-22 23:54:27 UTC (rev 2954)
+++ glibc-package/trunk/debian/changelog 2008-05-26 21:14:33 UTC (rev 2955)
@@ -12,6 +12,9 @@
[ Samuel Thibault ]
* patches/hurd-i386/cvs-termios.diff: update patch, fixes compilation of jove.
+ * patches/hurd-i386/local-pthread-unsupported-stubs.diff: new patch to
+ declare the unsupported function stubs, fixes compilation of pike. Also
+ bump the dependency on hurd-dev to get <gnu/stubs-pthread.h>.
-- Clint Adams <schizo@debian.org> Sun, 18 May 2008 07:42:57 -0400
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2008-05-22 23:54:27 UTC (rev 2954)
+++ glibc-package/trunk/debian/control 2008-05-26 21:14:33 UTC (rev 2955)
@@ -4,7 +4,7 @@
Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.13.5), bzip2, lzma, file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20071119-2) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426),
g++-4.2 (>= 4.2.1) [alpha amd64 i386 hurd-i386], g++-4.2-multilib [amd64 i386],
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-05-22 23:54:27 UTC (rev 2954)
+++ glibc-package/trunk/debian/control.in/main 2008-05-26 21:14:33 UTC (rev 2955)
@@ -4,7 +4,7 @@
Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.13.5), bzip2, lzma, file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20071119-2) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426),
g++-4.2 (>= 4.2.1) [alpha amd64 i386 hurd-i386], g++-4.2-multilib [amd64 i386],
Added: glibc-package/trunk/debian/patches/hurd-i386/local-pthread-unsupported-stubs.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-pthread-unsupported-stubs.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread-unsupported-stubs.diff 2008-05-26 21:14:33 UTC (rev 2955)
@@ -0,0 +1,13 @@
+Index: include/stubs-biarch.h
+===================================================================
+RCS file: /cvs/glibc/libc/include/stubs-biarch.h,v
+retrieving revision 1.1
+diff -u -p -r1.1 stubs-biarch.h
+--- glibc/include/stubs-biarch.h 11 Feb 2005 10:17:01 -0000 1.1
++++ glibc/include/stubs-biarch.h 26 May 2008 20:51:22 -0000
+@@ -10,3 +10,5 @@
+ #else
+ # error "unexpected value for __WORDSIZE macro"
+ #endif
++
++#include <gnu/stubs-pthread.h>
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2008-05-22 23:54:27 UTC (rev 2954)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2008-05-26 21:14:33 UTC (rev 2955)
@@ -2,3 +2,4 @@
hurd-i386/local-atomic-no-multiple_threads.diff
hurd-i386/local-no-strerror_l.diff
hurd-i386/local-pthread_stubs.diff
+hurd-i386/local-pthread-unsupported-stubs.diff
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2008-05-22 23:54:27 UTC (rev 2954)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2008-05-26 21:14:33 UTC (rev 2955)
@@ -19,7 +19,7 @@
# OS specific stuff
if ($DEB_HOST_ARCH_OS eq "hurd") {
- push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev', 'libpthread-stubs0-dev');
+ push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev (>= 20071119-2)', 'libpthread-stubs0-dev');
push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
push @{$libc_c{'Replaces'}}, 'glibc2';
Reply to: