Ubuntu
tabix package

Merge lp:~dpshorten/ubuntu/oneiric/tabix/ftbfs-jam into lp:ubuntu/oneiric/tabix

  1. Oneiric (11.10)
  2. ftbfs-jam
  3. Merge into oneiric
Proposed by David Shorten
Status: Merged
Merged at revision: 5
Proposed branch: lp:~dpshorten/ubuntu/oneiric/tabix/ftbfs-jam
Merge into: lp:ubuntu/oneiric/tabix
Diff against target: 62 lines (+26/-1)
5 files modified
.pc/applied-patches (+2/-0)
Makefile (+1/-1)
debian/changelog (+6/-0)
debian/patches/ld-as-needed.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~dpshorten/ubuntu/oneiric/tabix/ftbfs-jam
Reviewer Review Type Date Requested Status
Stefano Rivera Approve
Review via email: mp+66396@code.launchpad.net

Description of the change

Reordered libs in Makefile to build with ld --as-needed (LP: #803202)

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.pc'
2=== added file '.pc/applied-patches'
3--- .pc/applied-patches 1970-01-01 00:00:00 +0000
4+++ .pc/applied-patches 2011-06-29 22:18:25 +0000
5@@ -0,0 +1,2 @@
6+ld-as-needed.patch
7+ld-as-needed.patch
8
9=== modified file 'Makefile'
10--- Makefile 2011-04-12 17:15:33 +0000
11+++ Makefile 2011-06-29 22:18:25 +0000
12@@ -38,7 +38,7 @@
13 $(AR) -cru $@ $(LOBJS)
14
15 tabix:lib $(AOBJS)
16- $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
17+ $(CC) $(CFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz
18
19 bgzip:bgzip.o bgzf.o knetfile.o
20 $(CC) $(CFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2011-05-10 19:42:07 +0000
24+++ debian/changelog 2011-06-29 22:18:25 +0000
25@@ -1,3 +1,9 @@
26+tabix (0.2.5-1ubuntu1) oneiric; urgency=low
27+
28+ * Reordered libs in Makefile to build with ld --as-needed (LP: #803202)
29+
30+ -- David Shorten <dpshorten@gmail.com> Wed, 29 Jun 2011 22:23:21 +0200
31+
32 tabix (0.2.5-1) unstable; urgency=low
33
34 * New upstream release.
35
36=== added directory 'debian/patches'
37=== added file 'debian/patches/ld-as-needed.patch'
38--- debian/patches/ld-as-needed.patch 1970-01-01 00:00:00 +0000
39+++ debian/patches/ld-as-needed.patch 2011-06-29 22:18:25 +0000
40@@ -0,0 +1,16 @@
41+Description: Reorder libraries to build with ld --as-needed
42+Author: David Shorten <dpshorten@gmail.com>
43+Bug-Ubuntu: http://bugs.launchpad.net/ubuntu/+source/tabix/+bug/803202
44+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632150
45+Last-Update: 2011-06-30
46+--- a/Makefile
47++++ b/Makefile
48+@@ -38,7 +38,7 @@
49+ $(AR) -cru $@ $(LOBJS)
50+
51+ tabix:lib $(AOBJS)
52+- $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
53++ $(CC) $(CFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz
54+
55+ bgzip:bgzip.o bgzf.o knetfile.o
56+ $(CC) $(CFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz
57
58=== added file 'debian/patches/series'
59--- debian/patches/series 1970-01-01 00:00:00 +0000
60+++ debian/patches/series 2011-06-29 22:18:25 +0000
61@@ -0,0 +1,1 @@
62+ld-as-needed.patch

Subscribers

People subscribed via source and target branches

to all changes: