Package: logfs-tools
Version: 20100501-4
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpvTeGzv
In Ubuntu, the attached patch was applied to achieve the following:
Hi! This package ftbfs with new binutils-gold, and --as-needed use,
you can solve this problem with this patch.
Thanks!
* Merge from debian unstable. Remaining changes:
- debian/patches/fix-as-needed: Fix linking with --as-needed
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.37-8-generic (SMP w/1 CPU core)
Locale: LANG=es_ES.utf8, LC_CTYPE=es_ES.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru logfs-tools-20100501/debian/patches/fix-as-needed logfs-tools-20100501/debian/patches/fix-as-needed
--- logfs-tools-20100501/debian/patches/fix-as-needed 1970-01-01 01:00:00.000000000 +0100
+++ logfs-tools-20100501/debian/patches/fix-as-needed 2011-01-23 12:32:56.000000000 +0100
@@ -0,0 +1,20 @@
+Description: Fix linking with --as-needed.
+Author: Michael Bienia <[email protected]>
+
+--- logfs-tools-20100501.orig/Makefile
++++ logfs-tools-20100501/Makefile
+@@ -33,12 +33,12 @@ ifdef S
+ EXTRA_OBJ := $(ZLIB_O)
+ CFLAGS += -static
+ else
+-CFLAGS += -lz
++LIBS = -lz
+ endif
+
+ mklogfs: $(EXTRA_OBJ)
+ mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+
+ logfsck: $(ZLIB_O)
+ logfsck: fsck.o lib.o journal.o super.o
diff -Nru logfs-tools-20100501/debian/patches/series logfs-tools-20100501/debian/patches/series
--- logfs-tools-20100501/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ logfs-tools-20100501/debian/patches/series 2011-01-23 12:20:59.000000000 +0100
@@ -0,0 +1 @@
+fix-as-needed
