Package: dpkg
Version: 1.10.4
Tgas: patch
Hi,
the following two small fixes are necessary to compile dpkg 1.10.4 on the
Hurd. Please apply them for the next version.
First, the archtable needs to be extended for the new version I am going to
upload. It would be nice to support regular expressions here. The first
patch below adds this target.
Second, the -static targets sometimes use the normal ZLIB_LIBS setting,
which is "-Wl,static -lz -Wl,dynamic". However, the dynamic throws us out
of static linking, and ld gets confused about what start up files to use.
ZLIB_LIBS comes last on the command line, otherwise there would be even more
problems because of attempting to link some libs dynamically into a static
target. The second patch below fixes that.
Thanks,
Marcus
2002-08-13 Marcus Brinkmann <[EMAIL PROTECTED]>
* archtable: Recognise i386-gnu0.3.
diff -ru dpkg-1.10.4/archtable dpkg-1.10.4.new/archtable
--- dpkg-1.10.4/archtable 2002-01-01 14:16:37.000000000 +0100
+++ dpkg-1.10.4.new/archtable 2002-08-12 21:07:43.000000000 +0200
@@ -33,6 +33,7 @@
mipseb-linux-gnu mips mips
i386-gnu hurd-i386 undefined
i386-gnu0.2 hurd-i386 undefined
+i386-gnu0.3 hurd-i386 undefined
ia64-linux-gnu ia64 ia64
ia64-unknown-linux ia64 ia64
sh3-linux-gnu sh3 sh3
2002-08-13 Marcus Brinkmann <[EMAIL PROTECTED]>
* main/Makefile.in: New rule for dpkg-static to set ZLIB_LIBS
for static linking.
* utils/Makefile.in: Likewise for md5sum-static.
diff -ru dpkg-1.10.4/main/Makefile.in dpkg-1.10.4.new/main/Makefile.in
--- dpkg-1.10.4/main/Makefile.in 2002-05-20 06:40:26.000000000 +0200
+++ dpkg-1.10.4.new/main/Makefile.in 2002-08-12 19:14:27.000000000 +0200
@@ -61,6 +61,7 @@
done
dpkg-static: LDFLAGS += -static
+dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a
$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
diff -ru dpkg-1.10.4/utils/Makefile.in dpkg-1.10.4.new/utils/Makefile.in
--- dpkg-1.10.4/utils/Makefile.in 2002-05-20 06:40:28.000000000 +0200
+++ dpkg-1.10.4.new/utils/Makefile.in 2002-08-12 19:07:40.000000000 +0200
@@ -75,5 +75,6 @@
$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
md5sum-static: LDFLAGS += -static
+md5sum-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
$(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
--
`Rhubarb is no Egyptian god.' GNU http://www.gnu.org [EMAIL PROTECTED]
Marcus Brinkmann The Hurd http://www.gnu.org/software/hurd/
[EMAIL PROTECTED]
http://www.marcus-brinkmann.de/
