Merge lp:~scarneiro/ubuntu/oneiric/gosmore/fix-for-770751 into lp:ubuntu/oneiric/gosmore

[Sebastian Carneiro]

Linker parameter order changed to avoid build problems with GCC-4.6

[Stefano Rivera (stefanor)]

This patch isn't sufficient for it to build on oneiric. The issue visible in the build log still trips it up.

"-l xml2 -lm" Drop the first space?

Please re-target the changelog entry to oneiric. Also, your changelog line is too long.

review: Needs Fixing

[Sebastian Carneiro (scarneiro)]

I will look into that... I wasn't aware it was in such a bad shape. i will make the corrections and test it well, before asking for another review.

Thanks.

> This patch isn't sufficient for it to build on oneiric. The issue visible in
> the build log still trips it up.
>
> "-l xml2 -lm" Drop the first space?

>
> Please re-target the changelog entry to oneiric. Also, your changelog line is
> too long

[Stefano Rivera (stefanor)]

I'm marking this branch "Work in progress", as it isn't ready for sponsorship right now. Please change it back to "Needs review" when ready.

[Sebastian Carneiro (scarneiro)]

Corrected both problems mentioned by Stefano. I will also check the patch sent to Debian.

Ready for review.

Thanks Stefano!

[Stefano Rivera (stefanor)]

LGTM. Please forward this patch to Debian.

review: Approve

[Stefano Rivera (stefanor)]

...and upstream, if possible

[Sebastian Carneiro (scarneiro)]

Forwarded corrected patch to Debian. Will try to forwarded to upstream... All I could find is a README file with an email address for bug reporting.-

=== modified file 'Makefile.in'
--- Makefile.in	2010-07-12 11:24:32 +0000
+++ Makefile.in	2011-07-09 11:56:34 +0000
@@ -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 \

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-12 11:24:32 +0000
+++ debian/changelog	2011-07-09 11:56:34 +0000
@@ -1,3 +1,10 @@
+gosmore (0.0.0.20100711-1ubuntu1) oneiric; urgency=low
+
+  * Makefile.in: Reordered linker parameters to avoid problem with 
+    GCC-4.6 (LP: #770751)
+
+ -- Sebastian Carneiro <[e-mail]>  Fri, 08 Jul 2011 23:58:36 -0300
+
 gosmore (0.0.0.20100711-1) unstable; urgency=low
 
   * New upstream snapshot fetched for svn, revision: 22284