ld-as-needed.patch needs to be adapted

diff --git a/debian/changelog b/debian/changelog
index f788d41a1bb8b02f1de978dfb13ccbdf714ea896..477861c459ce30cfcfdf8514d4b2e4547a225969 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 tabix (0.2.5-3) UNRELEASED; urgency=low
 
 tabix (0.2.5-3) UNRELEASED; urgency=low
 

-  * debian/patches/ld-as-needed.patch:  Enable building with --as-needed
-    (Thanks to David Shorten <dpshorten@gmail.com> for the patch)
-    Closes: #632150

   * debian/patches/use-dpkg-buildflags.patch: Really enable hardening
     build flags (Thanks for the patch to Simon Ruderich <simon@ruderich.org>)
     Closes: #670759
   * debian/patches/use-dpkg-buildflags.patch: Really enable hardening
     build flags (Thanks for the patch to Simon Ruderich <simon@ruderich.org>)
     Closes: #670759

+  * debian/patches/ld-as-needed.patch:  Enable building with --as-needed
+    (Thanks to David Shorten <dpshorten@gmail.com> for the patch)
+    Closes: #632150

 
  -- Andreas Tille <tille@debian.org>  Fri, 11 May 2012 13:32:56 +0200
 
 
  -- Andreas Tille <tille@debian.org>  Fri, 11 May 2012 13:32:56 +0200
 

diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
index 89fa1ed243d4554670215b814a6bba9eb208f06e..bc0e2c8caf9254c2666bf3beb96255cda34f5ea3 100644 (file)
--- a/debian/patches/ld-as-needed.patch
+++ b/debian/patches/ld-as-needed.patch
@@ -5,12 +5,12 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632150
 Last-Update: 2011-06-30
 --- tabix.orig/Makefile
 +++ tabix/Makefile
 Last-Update: 2011-06-30
 --- tabix.orig/Makefile
 +++ tabix/Makefile

-@@ -38,7 +38,7 @@
+@@ -41,7 +41,7 @@

                $(AR) -cru $@ $(LOBJS)
  
  tabix:lib $(AOBJS)
                $(AR) -cru $@ $(LOBJS)
  
  tabix:lib $(AOBJS)

--              $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
-+              $(CC) $(CFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz  
+-              $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
++              $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz

  
  bgzip:bgzip.o bgzf.o knetfile.o
  
  bgzip:bgzip.o bgzf.o knetfile.o

-               $(CC) $(CFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz
+               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz