diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/libpthread_linker_script.patch | 33 |
2 files changed, 36 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d3501da9..65b0803b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hurd (200501xx-1) unreleased; urgency=low +hurd (20050119-1) unreleased; urgency=low * New snapshot from CVS. + Contains libpthread header fixes by Neal Walfield and @@ -12,6 +12,8 @@ hurd (200501xx-1) unreleased; urgency=low * debian/patches/netfs_io_select.patch: Likewise. * debian/patches/netfs_nonblock.patch: Likewise. * debian/patches-contrib/kbd.patch: Removed, no longer needed. + * debian/patches/libpthread_linker_script.patch: New patch. Install + libpthread.a linker script correctly. (Closes: #291307) -- Michael Banck <mbanck@debian.org> Wed, 19 Jan 2005 21:58:24 +0100 diff --git a/debian/patches/libpthread_linker_script.patch b/debian/patches/libpthread_linker_script.patch new file mode 100644 index 00000000..19339c9f --- /dev/null +++ b/debian/patches/libpthread_linker_script.patch @@ -0,0 +1,33 @@ +2005-01-21 Michael Banck <mbanck@debian.org> + + * Makefile ($(libdir)/libpthread2.a): Install linker script + from $(srcdir) instead of current directory. + ($(libdir)/libpthread2_pic.a): Likewise. + +Index: Makefile +=================================================================== +RCS file: /cvsroot/hurd/hurd/libpthread/Makefile,v +retrieving revision 1.2 +diff -u -r1.2 Makefile +--- Makefile 20 Aug 2003 20:40:06 -0000 1.2 ++++ Makefile 20 Jan 2005 23:35:31 -0000 +@@ -181,14 +181,16 @@ + .PHONY: $(libdir)/libpthread.a $(libdir)/libpthread_pic.a + + # XXX: These rules are a hack. But it is better than messing with +-# ../Makeconf at the moment. ++# ../Makeconf at the moment. Note that the linker scripts ++# $(srcdir)/libpthread.a and $(srcdir)/libpthread_pic.a get overwritten ++# when building in $(srcdir) and not a seperate build directory. + $(libdir)/libpthread2.a: $(libdir)/libpthread.a + mv $< $@ +- $(INSTALL_DATA) libpthread.a $< ++ $(INSTALL_DATA) $(srcdir)/libpthread.a $< + + $(libdir)/libpthread2_pic.a: $(libdir)/libpthread_pic.a + mv $< $@ +- $(INSTALL_DATA) libpthread_pic.a $< ++ $(INSTALL_DATA) $(srcdir)/libpthread_pic.a $< + + .PHONY: $(addprefix $(includedir)/, $(sysdeps_headers)) + |