r2885 - in glibc-package/trunk/debian: . control.in patches patches/hurd-i386 sysdeps
Author: sthibaul-guest
Date: 2008-03-21 12:57:55 +0000 (Fri, 21 Mar 2008)
New Revision: 2885
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-pthread_stubs.diff
Modified:
glibc-package/trunk/debian/changelog
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_stubs.diff: new patch to use libpthread
stubs from libpthread-stubs. Add libpthread-stubs0-dev dependency on
hurd-i386.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-21 09:43:18 UTC (rev 2884)
+++ glibc-package/trunk/debian/changelog 2008-03-21 12:57:55 UTC (rev 2885)
@@ -54,6 +54,9 @@
apply.
* patches/hurd-i386/submitted-mig-init.diff: new patch to fix uninitialized
local variables.
+ * patches/hurd-i386/local-pthread_stubs.diff: new patch to use libpthread
+ stubs from libpthread-stubs. Add libpthread-stubs0-dev dependency on
+ hurd-i386.
-- Aurelien Jarno <aurel32@debian.org> Thu, 20 Mar 2008 23:04:28 +0100
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-03-21 09:43:18 UTC (rev 2884)
+++ glibc-package/trunk/debian/control.in/main 2008-03-21 12:57:55 UTC (rev 2885)
@@ -4,7 +4,7 @@
Build-Depends: gettext, make (>= 3.80-1), 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-1) [hurd-i386], gnumach-dev [hurd-i386],
+ mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426-1),
g++-4.2 (>= 4.2.1) [alpha arm hppa s390 hurd-i386], g++-4.2-multilib [s390],
Added: glibc-package/trunk/debian/patches/hurd-i386/local-pthread_stubs.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-pthread_stubs.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread_stubs.diff 2008-03-21 12:57:55 UTC (rev 2885)
@@ -0,0 +1,29 @@
+Index: Makerules
+===================================================================
+RCS file: /cvs/glibc/libc/Makerules,v
+retrieving revision 1.450
+diff -u -p -r1.450 Makerules
+--- glibc/Makerules 26 Aug 2007 02:18:03 -0000 1.450
++++ glibc/Makerules 21 Jan 2008 09:41:42 -0000
+@@ -993,7 +993,8 @@ $(inst_libdir)/libc.so: $(common-objpfx)
+ cat $<; \
+ echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
+ '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
+- ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
++ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' ;\
++ echo 'INPUT ( AS_NEEDED ( -lpthread-stubs ) )' \
+ ) > $@.new
+ mv -f $@.new $@
+
+Index: sysdeps/mach/hurd/libc-ldscript
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/libc-ldscript,v
+retrieving revision 1.2
+diff -u -p -r1.2 libc-ldscript
+--- glibc/sysdeps/mach/hurd/libc-ldscript 4 Dec 1996 01:41:11 -0000 1.2
++++ glibc/sysdeps/mach/hurd/libc-ldscript 20 Jan 2008 22:19:41 -0000
+@@ -4,3 +4,4 @@
+ */
+
+ GROUP ( libcrt.a libmachuser.a libhurduser.a )
++INPUT ( -lpthread-stubs )
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2008-03-21 09:43:18 UTC (rev 2884)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2008-03-21 12:57:55 UTC (rev 2885)
@@ -1,3 +1,4 @@
hurd-i386/local-gscope.diff
hurd-i386/local-atomic-no-multiple_threads.diff
hurd-i386/local-no-strerror_l.diff
+hurd-i386/local-pthread_stubs.diff
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2008-03-21 09:43:18 UTC (rev 2884)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2008-03-21 12:57:55 UTC (rev 2885)
@@ -19,7 +19,7 @@
# OS specific stuff
if ($DEB_HOST_ARCH_OS eq "hurd") {
- push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev');
+ push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev', 'libpthread-stubs0-dev');
push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
push @{$libc_c{'Replaces'}}, 'glibc2';
Reply to: