Package: tokyotyrant
Version: 1.1.40-4
Followup-For: Bug #615787
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
*** /tmp/tmpcEAunj
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/006-no-add-needed: (LP: #756048) (Closes: #615787)
Add all libraries needed to linker commandline, fixes FTBFS
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-999-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJOGLNzAAoJEGHzRCZ03mYkFbEQAJiIkMzfu0Er2q1YePPiImSr
8l/tijBatqfd3LViuu62Bqc4VKcumHaNv73IjWLvqIbpf+OhCkLAKX1XGib6wZpY
IRVPsWOhFdiL8Ssh76zTwsNO6G9JcpCaQ9uJo/SuCswQ77BU004qzATjMhKNi+js
4/pMv6DGyK/VDEZBvvQ7mC2fttWk+6IP8bybV8at2t4wPilmR5X4mYsZSOktCLgo
Kgo9cygRtL9trhx3a2VVYMHDwDDatVOIXbQyFNvnP3IJSa3znHhZoyLxMH0fPwIr
MmD7sEwfsP0lQ+kZ2iGp9Pnrsw2IEXrfIwTWSSBYIrEnSI2MLaUrcXMNZX+dBX+x
uz7c2fKIJpHBJ6CaobXEXyO0jqCjF3hHZBvTzaJbG6Gm74oYsBrINVY75H94RERm
eEyVAtt1XFR63I5NeFiwg75F4kXx0C4tMCYJ9ANK7MoR4gb+n89tcoIsxiHd7kNg
KTN++ltSLtTyPgrpDOX0OCx3vXQ/IK3xPqxdezRE1yi1vHIjXUFf8R5zoWMaECDV
t8MQX8OF7rHj4AEoR6OWxHIy0Hh8e41vGqsX0udmCJhondfRz6PZeHXT+1C3uWAW
fe/WpAY228B3I+IhizaxZZkCG3N4DqIUlgtCGyBn9e6W6474/L/MFOj2GpkJyJDE
YUQsLuqzufvyNCtvrSKv
=5A6f
-----END PGP SIGNATURE-----
diff -Nru tokyotyrant-1.1.40/debian/patches/006-no-add-needed tokyotyrant-1.1.40/debian/patches/006-no-add-needed
--- tokyotyrant-1.1.40/debian/patches/006-no-add-needed 1970-01-01 01:00:00.000000000 +0100
+++ tokyotyrant-1.1.40/debian/patches/006-no-add-needed 2011-07-09 21:54:47.000000000 +0200
@@ -0,0 +1,51 @@
+Description: Add all needed libs to linker
+ with --no-add-needed you need to specify all libraries needed to link
+ the binaries, as the DT_NEEDED entries aren't copied anymore.
+Author: Andreas Moog <am...@ubuntu.com>
+Last-Update: 2011-07-09
+
+--- tokyotyrant-1.1.40.orig/Makefile.in
++++ tokyotyrant-1.1.40/Makefile.in
+@@ -57,7 +57,7 @@ CPPFLAGS = @MYCPPFLAGS@ \
+ CFLAGS = @MYCFLAGS@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -llua5.1 -ltokyocabinet
+ RUNENV = @MYLDLIBPATHENV@=.
+ POSTCMD = @MYPOSTCMD@
+
+@@ -342,27 +342,27 @@ ttskelnull.bundle : ttskelnull.o
+
+
+ ttserver : ttserver.o scrext.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< scrext.o $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< scrext.o $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ ttulmgr : ttulmgr.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ ttultest : ttultest.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ tcrtest : tcrtest.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ tcrmttest : tcrmttest.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ tcrmgr : tcrmgr.o $(LIBRARYFILES)
+- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant
++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS)
+
+
+ myconf.o scrext.o : myconf.h
diff -Nru tokyotyrant-1.1.40/debian/patches/series tokyotyrant-1.1.40/debian/patches/series
--- tokyotyrant-1.1.40/debian/patches/series 2010-05-16 18:46:23.000000000 +0200
+++ tokyotyrant-1.1.40/debian/patches/series 2011-07-09 21:59:49.000000000 +0200
@@ -4,3 +4,4 @@
003-run-service-make-check
004-kfreebsd-fix
005-change-default-port
+006-no-add-needed
