Package: oss-preserve
Version: 1.1-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
User: debian-...@lists.debian.org
Usertags: ld-as-needed

see http://wiki.debian.org/ToolChain/DSOLinking#Only_link_with_needed_libraries

failed build
https://launchpad.net/ubuntu/+archive/test-rebuild-20110816/+build/2707315


diff -u oss-preserve-1.1/debian/changelog oss-preserve-1.1/debian/changelog
--- oss-preserve-1.1/debian/changelog
+++ oss-preserve-1.1/debian/changelog
@@ -1,3 +1,15 @@
+oss-preserve (1.1-6ubuntu2) oneiric; urgency=low
+
+  * Fix applying the ld-as-needed patch.
+
+ -- Matthias Klose <d...@ubuntu.com>  Wed, 14 Sep 2011 11:49:06 +0200
+
+oss-preserve (1.1-6ubuntu1) oneiric; urgency=low
+
+  * Fix FTBFS with ld --as-needed. LP: #771105.
+
+ -- Matthias Klose <d...@ubuntu.com>  Wed, 14 Sep 2011 10:54:26 +0200
+
 oss-preserve (1.1-6) unstable; urgency=low
 
   * Update glib depends to libglib2.0 (Closes: #523710)
diff -u oss-preserve-1.1/debian/patches/series 
oss-preserve-1.1/debian/patches/series
--- oss-preserve-1.1/debian/patches/series
+++ oss-preserve-1.1/debian/patches/series
@@ -3 +3 @@
-
+ld-as-needed.diff
only in patch2:
unchanged:
--- oss-preserve-1.1.orig/debian/patches/ld-as-needed.diff
+++ oss-preserve-1.1/debian/patches/ld-as-needed.diff
@@ -0,0 +1,29 @@
+--- ./Makefile.am~     2011-09-14 10:57:59.000000000 +0200
++++ ./Makefile.am      2011-09-14 11:00:14.560571554 +0200
+@@ -19,6 +19,6 @@
+ 
+ bin_PROGRAMS = ossctl
+ ossctl_SOURCES = ossctl.c
+-ossctl_LDFLAGS = `pkg-config glib-2.0 --libs`
++ossctl_LDADD = `pkg-config glib-2.0 --libs`
+ 
+ AM_CFLAGS = `pkg-config glib-2.0 --cflags`
+--- ./Makefile.in~     2011-09-14 10:57:59.000000000 +0200
++++ ./Makefile.in      2011-09-14 11:00:29.920594088 +0200
+@@ -85,7 +85,7 @@
+ 
+ bin_PROGRAMS = ossctl
+ ossctl_SOURCES = ossctl.c
+-ossctl_LDFLAGS = `pkg-config glib-2.0 --libs`
++ossctl_LDADD = `pkg-config glib-2.0 --libs`
+ 
+ AM_CFLAGS = `pkg-config glib-2.0 --cflags`
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -99,7 +99,6 @@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ ossctl_OBJECTS =  ossctl.o
+-ossctl_LDADD = $(LDADD)
+ ossctl_DEPENDENCIES = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS)

Reply via email to