Package: gosmore
Severity: normal
Following a review from Stefano Rivera, who found an error in my original
patch, I am resubmitting it with the corrections already done and tested
in Ubuntu.
Thanks for considering my patch.
Best regards.
Sebastian Carneiro
scarne...@fibertel.com.ar
-- System Information:
Debian Release: 6.0.2
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u gosmore-0.0.0.20100711/debian/changelog gosmore-0.0.0.20100711/debian/changelog
--- gosmore-0.0.0.20100711/debian/changelog
+++ gosmore-0.0.0.20100711/debian/changelog
@@ -1,3 +1,12 @@
+gosmore (0.0.0.20100711-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Makefile.in: in linker invocations, the libraries parameters
+ has been moved to the end to fix FTBFS when using ld --as-needed.
+ (Closes: 631251)
+
+ -- Sebastian Carneiro <scarne...@fibertel.com.ar> Sat, 09 Jul 2011 14:21:22 -0300
+
gosmore (0.0.0.20100711-1) unstable; urgency=low
* New upstream snapshot fetched for svn, revision: 22284
only in patch2:
unchanged:
--- gosmore-0.0.0.20100711.orig/Makefile.in
+++ gosmore-0.0.0.20100711/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 \
