[gosmore] 02/04: Reorder library parameters in Makefile

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository gosmore.

commit d4c677da3f618e7bbf0fd3c54f8ea67ee637e736
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Mon Sep 14 21:21:39 2015 +0200

    Reorder library parameters in Makefile
    
    Closes: 631251
    Thanks: Sebastian Carneiro
---
 debian/patches/linker_flags.diff | 55 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/linker_flags.diff b/debian/patches/linker_flags.diff
new file mode 100644
index 0000000..3b4916e
--- /dev/null
+++ b/debian/patches/linker_flags.diff
@@ -0,0 +1,55 @@
+Description: Reorder linker invocations
+  * Makefile.in: in linker invocations, the libraries parameters
+    has been moved to the end to fix FTBFS when using ld --as-needed.
+Forwarded: Not yet
+Author: Sebastian Carneiro <scarneiro at fibertel.com.ar>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631251
+Last-Update: 2015-09-14
+--- gosmore.orig/Makefile.in
++++ gosmore/Makefile.in
+@@ -34,8 +34,8 @@
+ # I found that it's more reliable and more portable to use aplay, but
+ # gnome sound can still be activated with this:
+ #  `pkg-config --cflags --libs libgnomeui-2.0 && echo -DUSE_GNOMESOUND`
+-XMLFLAGS=`pkg-config --cflags libxml-2.0 || echo -I /usr/include/libxml2` \
+-  `pkg-config --libs libxml-2.0 || echo -l xml2 -lm`
++XMLFLAGS=`pkg-config --cflags libxml-2.0 || echo -I /usr/include/libxml2`
++XMLLIBS= `pkg-config --libs libxml-2.0 || echo -lxml2 -lm`
+ ARCH=arm-mingw32ce-
+ else
+ # To compile with mingw, install MSYS and mingw, and then download
+@@ -58,11 +58,11 @@
+ # it. THE CODE IS NOT FINISHED. Linux version looks promising.
+ gosmore:	gosmore.cpp libgosm.cpp libgosm.h bboxes.c
+ 		g++ -DCHILDREN=16 ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
+-                  gosmore.cpp libgosm.cpp -o gosmore ${EXTRA}
++                  gosmore.cpp libgosm.cpp -o gosmore ${EXTRA} ${XMLLIBS}
+ 
+ gosmore16:	gosmore.cpp libgosm.cpp libgosm.h
+ 		g++ -DGOSMZ=16 ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
+-                  gosmore.cpp libgosm.cpp -o gosmore16 ${EXTRA}
++                  gosmore.cpp libgosm.cpp -o gosmore16 ${EXTRA} ${XMLLIBS}
+ 
+ $(ARCH)gosmore.exe:	gosmore.cpp libgosm.cpp gosmore.rsc resource.h \
+                     libgosm.h ceglue.h ceglue.c bboxes.c
+@@ -83,17 +83,17 @@
+ 		wget -O - ${WIKIPAGE}/Translations |./extract >translations.c
+ 
+ extract:	extract.c
+-		${CC} ${CFLAGS} ${XMLFLAGS} extract.c -o extract
++		${CC} ${CFLAGS} ${XMLFLAGS} extract.c -o extract ${XMLLIBS}
+ 
+ bboxes.c:	density.c density.txt
+-		gcc -lm density.c -o density
++		gcc density.c -o density -lm
+ 		./density <density.txt >density.sh
+ # wget http://www.openstreetmap.org/api/0.6/changeset/1707270/download -O \
+ #   countries.osm
+ 
+ osmunda:	osmunda.cpp libgosm.cpp libgosm.h
+ 		g++ ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
+-		  osmunda.cpp libgosm.cpp -o osmunda
++		  osmunda.cpp libgosm.cpp -o osmunda ${XMLLIBS}
+ voices:
+ 		echo '(voice_rab_diphone)' >/tmp/voice_rab_diphone
+ 		echo 'At the junction, turn left.' | festival_client \
diff --git a/debian/patches/series b/debian/patches/series
index be435ca..3087cb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 curl_types.h
 no-strict-overflow.diff
+linker_flags.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gosmore.git