Merge lp:~jtaylor/ubuntu/oneiric/cdpr/fix-803174 into lp:ubuntu/oneiric/cdpr

Proposed by Julian Taylor on 2011-08-21
Status: Merged
Merged at revision: 5
Proposed branch: lp:~jtaylor/ubuntu/oneiric/cdpr/fix-803174
Merge into: lp:ubuntu/oneiric/cdpr
Diff against target: 66 lines (+37/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/0003-fix-as-needed-build.patch (+27/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/cdpr/fix-803174
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-08-21 Pending
Review via email: mp+72338@code.launchpad.net

Description of the change

fix ftbs

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-05 17:42:51 +0000
3+++ debian/changelog 2011-08-21 14:29:28 +0000
4@@ -1,3 +1,10 @@
5+cdpr (2.4-1ubuntu1) oneiric; urgency=low
6+
7+ * debian/patches/0003-fix-as-needed-build.patch:
8+ - fix build with ld --as-needed (LP: #803174)
9+
10+ -- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 21 Aug 2011 16:25:51 +0200
11+
12 cdpr (2.4-1) unstable; urgency=low
13
14 * New upstream release, closes: #570916
15
16=== modified file 'debian/control'
17--- debian/control 2011-05-05 17:42:51 +0000
18+++ debian/control 2011-08-21 14:29:28 +0000
19@@ -1,5 +1,6 @@
20 Source: cdpr
21-Maintainer: Matt Zagrabelny <mzagrabe@d.umn.edu>
22+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
23+XSBC-Original-Maintainer: Matt Zagrabelny <mzagrabe@d.umn.edu>
24 Section: net
25 Priority: extra
26 Build-Depends: debhelper (>= 8.0.0), libpcap0.8-dev (>= 1.0.0)
27
28=== added file 'debian/patches/0003-fix-as-needed-build.patch'
29--- debian/patches/0003-fix-as-needed-build.patch 1970-01-01 00:00:00 +0000
30+++ debian/patches/0003-fix-as-needed-build.patch 2011-08-21 14:29:28 +0000
31@@ -0,0 +1,27 @@
32+Description: fix build with ld --as-needed
33+ when building with ld --as-needed libraries must be placed
34+ after object files needing them on the command line so the symbols
35+ of the libraries are registered as needed.
36+Author: Julian Taylor <jtaylor.debian@googlemail.com>
37+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cdpr/+bug/803174
38+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632665
39+--- cdpr-2.4.orig/Makefile
40++++ cdpr-2.4/Makefile
41+@@ -16,7 +16,7 @@ CFLAGS = -Wall -W -O2
42+ # Build for Solaris with the pcap headers/libs one dir up
43+ #CFLAGS = -DSOLARIS -Wall -I. -I../libpcap-0.7.1 -L../libpcap-0.7.1 -ggdb
44+
45+-LDFLAGS = -lpcap
46++LIBS = -lpcap
47+
48+ # Build for Solaris
49+ #LDFLAGS = -lsocket -lnsl -lpcap
50+@@ -33,7 +33,7 @@ conffile.o: conffile.c cdp.h cdpr.h
51+ gcc -c $(CFLAGS) conffile.c
52+
53+ cdpr: cdpr.o cdprs.o conffile.o
54+- gcc $(LDFLAGS) -o cdpr cdpr.o cdprs.o conffile.o
55++ gcc $(LDFLAGS) -o cdpr cdpr.o cdprs.o conffile.o $(LIBS)
56+
57+ install: all
58+ mkdir -p $(DESTDIR)$(prefix)/sbin/
59
60=== modified file 'debian/patches/series'
61--- debian/patches/series 2011-05-05 17:42:51 +0000
62+++ debian/patches/series 2011-08-21 14:29:28 +0000
63@@ -1,2 +1,3 @@
64 0001-Spruced-up-Makefile.patch
65 0002-remove-pseudo-device-all-from-list-of-interfaces.patch
66+0003-fix-as-needed-build.patch

Subscribers

People subscribed via source and target branches

to all changes: