package ace-of-penguins tag 712534 + patch thanks On Sun, Jun 16, 2013 at 03:06:04PM -0700, Daniel Schepler wrote: > /bin/bash ../libtool --tag=CC --mode=link cc -Wall -g -O2 -fPIE > -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security > -Wall -D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=2 -Wl,--as-needed -Wl,-z,now > -fPIE -pie -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -Wall -g -O2 -fPIE > -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security > -Wall -D_FORTIFY_SOURCE=2 -Wl,--as-needed -Wl,-z,now -fPIE -pie -Wl,-z,relro > -Wl,-z,now -Wl,--as-needed -o penguins penguins.o ../lib/libcards.la -lpng > -lz -lX11 -lm > libtool: link: cc -Wall -g -O2 -fPIE -fstack-protector > --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall > -D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=2 -Wl,--as-needed -Wl,-z -Wl,now -fPIE > -pie -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--as-needed -Wall -g -O2 -fPIE > -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security > -Wall -D_FORTIFY_SOURCE=2 -Wl,--as-needed -Wl,-z -Wl,now -fPIE -pie -Wl,-z > -Wl,relro -Wl,-z -Wl,now -Wl,--as-needed -o .libs/penguins penguins.o > ../lib/.libs/libcards.so -lpng -lz -lX11 -lm > ../lib/.libs/libcards.so: undefined reference to `png_read_update_info' > ../lib/.libs/libcards.so: undefined reference to `png_get_rowbytes' > ../lib/.libs/libcards.so: undefined reference to `png_read_end'
> This may be related to the upgrade to binutils 2.23.52.20130612-1 which is > more strict about making each component properly declare its own NEEDED > dependencies. Two patches attached. The package currently has a patch that amends both Makefile.am and Makefile.in; if automake is installed then the Makefile.in was overwritten. The first attachment makes it always use dh_autoreconf. The second attachment adds the -lpng that is needed for this FTBFS. Regards, Steve
>From b90afc74f24712090f8eb5520cff22b0172da699 Mon Sep 17 00:00:00 2001 From: Steve Cotton <Steve Cotton st...@s.cotton.clara.co.uk> Date: Mon, 17 Jun 2013 16:52:35 +0100 Subject: [PATCH 1/2] rules: use dh_autoreconf / automake --- debian/control | 2 +- debian/patches/50-buildflags.patch | 17 +---------------- debian/rules | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/debian/control b/debian/control index 4d33a81..ec2c620 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ace-of-penguins Section: games Priority: optional Maintainer: Jari Aalto <jari.aa...@cante.net> -Build-Depends: debhelper (>= 9), autotools-dev, libpng-dev, libx11-dev, libxpm-dev, zlib1g-dev +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libpng-dev, libx11-dev, libxpm-dev, zlib1g-dev Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=collab-maint/ace-of-penguins.git Vcs-Git: git://git.debian.org/collab-maint/ace-of-penguins.git diff --git a/debian/patches/50-buildflags.patch b/debian/patches/50-buildflags.patch index bdf314e..f6c4f1c 100644 --- a/debian/patches/50-buildflags.patch +++ b/debian/patches/50-buildflags.patch @@ -1,22 +1,7 @@ From: Simon Ruderich <si...@ruderich.org> Subject: Add dupport for CPPFLAGS -Last-Update: 2012-03-24 +Last-Update: 2013-06-17 ---- ace-of-penguins-1.3.orig/lib/Makefile.in -+++ ace-of-penguins-1.3/lib/Makefile.in -@@ -565,10 +565,10 @@ images.c : make-imglib Makefile images.i - ./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c - - make-imglib : make-imglib.c -- $(BUILD_CC) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz -+ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz - - text2c : text2c.c -- $(BUILD_CC) $(srcdir)/text2c.c -o text2c -lpng -lz -+ $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. --- ace-of-penguins-1.3.orig/lib/Makefile.am +++ ace-of-penguins-1.3/lib/Makefile.am @@ -24,7 +24,7 @@ images.c : make-imglib Makefile images.i diff --git a/debian/rules b/debian/rules index 31b6889..37d73b1 100755 --- a/debian/rules +++ b/debian/rules @@ -133,7 +133,7 @@ override_dh_installdocs: dh_installdocs -X COPYING -X .git -X CVS -X .svn docs/* %: - dh $@ + dh $@ --with autoreconf .PHONY: test man build-man clean-man -- 1.8.3.1
>From d9652be7be26ae76a038f68f2f4d18615219e90a Mon Sep 17 00:00:00 2001 From: Steve Cotton <Steve Cotton st...@s.cotton.clara.co.uk> Date: Mon, 17 Jun 2013 20:01:06 +0100 Subject: [PATCH 2/2] debian/patches/55-more-buildflags: Link libcards.so to libpng (Closes: #712534) --- debian/patches/55-more-buildflags.patch | 14 ++++++++++++++ debian/patches/series | 1 + 2 files changed, 15 insertions(+) create mode 100644 debian/patches/55-more-buildflags.patch diff --git a/debian/patches/55-more-buildflags.patch b/debian/patches/55-more-buildflags.patch new file mode 100644 index 0000000..7e821b0 --- /dev/null +++ b/debian/patches/55-more-buildflags.patch @@ -0,0 +1,14 @@ +Description: Link libraries that libcards needs (closes: #712534) +Author: Steve Cotton <st...@s.cotton.clara.co.uk> +Last-Update: 2013-06-17 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -6,7 +6,7 @@ + CLEANFILES = images.c images.d + + INCLUDES = $(X_CFLAGS) @PDA@ +-AM_LDFLAGS = $(X_LIBS) ++AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm + + BUILD_CC = @BUILD_CC@ + AR = @AR@ diff --git a/debian/patches/series b/debian/patches/series index 2fdd02c..3cc19c5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 40-include.patch 45-libpng15 50-buildflags.patch +55-more-buildflags.patch -- 1.8.3.1
