r2987 - in glibc-package/trunk/debian: . control.in patches patches/hurd-i386 sysdeps
Author: sthibaul-guest
Date: 2008-07-12 15:26:56 +0000 (Sat, 12 Jul 2008)
New Revision: 2987
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-pthread_types.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_types.diff: New patch to drag pthread
types from hurd headers. Bump the hurd-dev dependency version
accordingly.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-07-08 16:27:47 UTC (rev 2986)
+++ glibc-package/trunk/debian/changelog 2008-07-12 15:26:56 UTC (rev 2987)
@@ -25,6 +25,9 @@
* Use gcc-4.3 on hurd-i386.
* patches/hurd-i386/cvs-open_2.diff: New patch to implement __open_2
and __openat_2. Together with kfreebsd update closes: #489357.
+ * patches/hurd-i386/local-pthread_types.diff: New patch to drag pthread
+ types from hurd headers. Bump the hurd-dev dependency version
+ accordingly.
-- Aurelien Jarno <aurel32@debian.org> Tue, 08 Jul 2008 18:26:28 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2008-07-08 16:27:47 UTC (rev 2986)
+++ glibc-package/trunk/debian/control 2008-07-12 15:26:56 UTC (rev 2987)
@@ -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 (>= 20071119-2) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [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],
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-07-08 16:27:47 UTC (rev 2986)
+++ glibc-package/trunk/debian/control.in/main 2008-07-12 15:26:56 UTC (rev 2987)
@@ -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 (>= 20071119-2) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [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],
Added: glibc-package/trunk/debian/patches/hurd-i386/local-pthread_types.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-pthread_types.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread_types.diff 2008-07-12 15:26:56 UTC (rev 2987)
@@ -0,0 +1,10 @@
+Index: glibc/bits/pthreadtypes.h
+===================================================================
+RCS file: /cvs/glibc/libc/bits/pthreadtypes.h,v
+retrieving revision 1.1
+diff -u -p -r1.1 pthreadtypes.h
+--- glibc/bits/pthreadtypes.h 10 Nov 2002 23:22:34 -0000 1.1
++++ glibc/bits/pthreadtypes.h 28 Jun 2008 00:14:16 -0000
+@@ -1 +1 @@
+-/* No thread support. */
++#include <pthread/pthreadtypes.h>
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2008-07-08 16:27:47 UTC (rev 2986)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2008-07-12 15:26:56 UTC (rev 2987)
@@ -4,4 +4,5 @@
hurd-i386/local-pthread_stubs.diff
hurd-i386/local-pthread-unsupported-stubs.diff
hurd-i386/local-unlockpt-chroot.diff
+hurd-i386/local-pthread_types.diff
hurd-i386/local-msg-nosignal.diff -p0
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2008-07-08 16:27:47 UTC (rev 2986)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2008-07-12 15:26:56 UTC (rev 2987)
@@ -19,7 +19,7 @@
# OS specific stuff
if ($DEB_HOST_ARCH_OS eq "hurd") {
- push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev (>= 20071119-2)', 'libpthread-stubs0-dev');
+ push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev (>= 20080607-3)', 'libpthread-stubs0-dev');
push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
push @{$libc_c{'Replaces'}}, 'glibc2';
Reply to: