Package: redis Version: 2:2.2.5-1 Severity: important Tags: patch Justification: fails to build from source User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu maverick ubuntu-patch
*** /tmp/tmpd8yBDF In Ubuntu, we've applied the attached patch to achieve the following: * Fix FTBFS (LP: #771061) We thought you might be interested in doing the same. -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid-proposed'), (500, 'lucid-backports'), (500, 'lucid') Architecture: i386 (i686) Kernel: Linux 2.6.32-31-generic (SMP w/2 CPU cores) Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
=== added file '.pc/.quilt_patches' --- .pc/.quilt_patches 1970-01-01 00:00:00 +0000 +++ .pc/.quilt_patches 2011-05-25 20:56:02 +0000 @@ -0,0 +1 @@ +debian/patches === added file '.pc/.quilt_series' --- .pc/.quilt_series 1970-01-01 00:00:00 +0000 +++ .pc/.quilt_series 2011-05-25 20:56:02 +0000 @@ -0,0 +1 @@ +series === modified file 'debian/changelog' === modified file 'debian/control' --- debian/control 2011-02-24 19:39:43 +0000 +++ debian/control 2011-05-25 04:31:03 +0000 @@ -1,7 +1,8 @@ Source: redis Section: database Priority: optional -Maintainer: Chris Lamb <la...@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Chris Lamb <la...@debian.org> Build-Depends: debhelper (>= 7.0.50) Standards-Version: 3.9.1 Homepage: http://redis.io/ === added file 'debian/patches/fix-link-ordering' --- debian/patches/fix-link-ordering 1970-01-01 00:00:00 +0000 +++ debian/patches/fix-link-ordering 2011-05-26 18:31:33 +0000 @@ -0,0 +1,46 @@ +# Descrption: Fix the failed to build from source due to the --as-needed linking +# Bug: LP: https://launchpad.net/bugs/771061 +# Author: Nigel Babu <nigelb...@ubuntu.com> +--- a/src/Makefile ++++ b/src/Makefile +@@ -19,7 +19,7 @@ + CCLINK+= -ltcmalloc + CFLAGS+= -DUSE_TCMALLOC + endif +-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) ++CCOPT= $(CFLAGS) $(ARCH) $(PROF) + + PREFIX= /usr/local + INSTALL_BIN= $(PREFIX)/bin +@@ -111,26 +111,26 @@ + cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" + + redis-server: $(OBJ) +- $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) ++ $(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) + + redis-benchmark: dependencies $(BENCHOBJ) + cd ../deps/hiredis && $(MAKE) static +- $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a ++ $(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) + + redis-benchmark.o: + $(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $< + + redis-cli: dependencies $(CLIOBJ) +- $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o ++ $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ) ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(CCLINK) + + redis-cli.o: + $(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $< + + redis-check-dump: $(CHECKDUMPOBJ) +- $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) ++ $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(CCLINK) + + redis-check-aof: $(CHECKAOFOBJ) +- $(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) ++ $(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK) + + .c.o: + $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $< === modified file 'debian/patches/series' --- debian/patches/series 2011-04-25 14:04:29 +0000 +++ debian/patches/series 2011-05-25 20:56:02 +0000 @@ -1 +1,2 @@ debian-changes-2:2.2.5-1 +fix-link-ordering
