summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2008-07-04 14:18:09 +0000
committerSamuel Thibault <sthibault@debian.org>2008-07-04 14:18:09 +0000
commita667f0c7b3f4a11aa426c9383c0b3f66ac1b6d6b (patch)
treeef341ccd325a9e128dedea6fbe139216cf723165
parent3d5f9444ee5a0f0544283a47868ff8f10fdb7439 (diff)
* debian/patches/libpthread_stubs.patch: Fix build.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/libpthread_stubs.patch7
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index dc997d7d..6bbb5103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
hurd (20080607-2) UNRELEASED; urgency=low
+ [Samuel Thibault]
* debian/patches/libpthread_pthreadtypes_h.patch: New patch to get pthread
types into <pthread/pthreadtypes.h>, which <bits/pthreadtypes.h> will be
able to include.
+ * debian/patches/libpthread_stubs.patch: Fix build.
-- Michael Banck <mbanck@debian.org> Wed, 11 Jun 2008 15:40:16 +0200
diff --git a/debian/patches/libpthread_stubs.patch b/debian/patches/libpthread_stubs.patch
index 1d3932b9..6b73174a 100644
--- a/debian/patches/libpthread_stubs.patch
+++ b/debian/patches/libpthread_stubs.patch
@@ -35,12 +35,15 @@ diff -u -p -r1.7 Makefile
# XXX: These rules are a hack. But it is better than messing with
# ../Makeconf at the moment. Note that the linker scripts
-@@ -199,6 +199,15 @@ $(libdir)/libpthread2_pic.a: $(libdir)/l
+@@ -199,6 +199,18 @@ $(libdir)/libpthread2_pic.a: $(libdir)/l
mv $< $@
$(INSTALL_DATA) $(srcdir)/libpthread_pic.a $<
-+$(includedir)/gnu/stubs-pthread.h: $(OBJS)
++install-stubs-pthread: stubs-pthread.h
+ mkdir -p $(includedir)/gnu
++ $(INSTALL_DATA) $< $(includedir)/gnu/stubs-pthread.h
++
++stubs-pthread.h: $(OBJS)
+ $(OBJDUMP) -h $^ | \
+ $(AWK) '/\.gnu\.glibc-stub\./ { \
+ sub(/\.gnu\.glibc-stub\./, "", $$2); \