From 844bf1b4e34a19672f964d7c01909031b5704b80 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 20 Sep 2010 12:08:09 -0400 Subject: [PATCH] Fix compilation with LDFLAGS=-Wl,--no-add-needed If you link against a library A that itself links against a library B, it may or may not work to use symbols from library B in your executable; this is known as "indirect linking". GNU ld does indirect linking by default (but it can be disabled using --no-add-needed), but the new experimental GNU gold linker does not do this. It's an easy fix for us, as the tests are all already done in ./configure, we just need to tell the Makefile.ams to use the results. This should fix Debian bug #556677, if they ever start using this branch. [crmafra: Folded Andreas Metzler patch to update debian/changelog] Signed-off-by: Brad Jorsch --- WPrefs.app/Makefile.am | 2 ++ debian/changelog | 1 + src/Makefile.am | 1 + util/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 05bd3e3f..393756b2 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -54,5 +54,7 @@ WPrefs_LDADD = \ $(top_builddir)/WINGs/libWINGs.la\ $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la \ + @XLFLAGS@ @XLIBS@ \ @XFTLIBS@ \ + @FCLIBS@ \ @INTLIBS@ diff --git a/debian/changelog b/debian/changelog index ba6daea4..7750556e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ wmaker (0.92.0+git-0) unstable; urgency=low + wmsetbg crashing on big png images. (Fixed by git 2ccc8e4a79a3179454d82b9acc574135ea6369a4, switching from alloca to calloc - wrlib/png.c) Closes: #148370 + + Fix compilation with LDFLAGS=-Wl,--no-add-needed Closes: #556677 * Provide detached debugging symbols in wmaker-dbg package. -- Andreas Metzler Sat, 07 Aug 2010 10:56:00 +0200 diff --git a/src/Makefile.am b/src/Makefile.am index 3fe3962a..f883f77e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -120,4 +120,5 @@ wmaker_LDADD = \ @XLFLAGS@ \ @XFTLIBS@ \ @XLIBS@ \ + @LIBM@ \ @INTLIBS@ diff --git a/util/Makefile.am b/util/Makefile.am index 5149e4a6..daba0faf 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -49,7 +49,7 @@ wmagnify_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \ $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ - @XFTLIBS@ @INTLIBS@ + @XLFLAGS@ @XLIBS@ @XFTLIBS@ @INTLIBS@ wmsetbg_LDADD = \ $(top_builddir)/WINGs/libWINGs.la \