The following commit has been merged in the master branch: commit 19ed62178e719df4cb75707a357e96cc01975da8 Author: David Paleino <da...@debian.org> Date: Sat Jan 21 16:02:43 2012 +0100
Fix FTBFS with ld --as-needed, thanks to Julian Taylor (Closes: #656751) diff --git a/debian/changelog b/debian/changelog index 0b2aae3..4d6b6cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmium (0.0~20111114-ga147fb1-2) UNRELEASED; urgency=low + + * Fix FTBFS with ld --as-needed, thanks to Julian Taylor + (Closes: #656751) + + -- David Paleino <da...@debian.org> Sat, 21 Jan 2012 16:02:18 +0100 + osmium (0.0~20111114-ga147fb1-1) unstable; urgency=low * Initial release (Closes: #648710) diff --git a/debian/patches/01-fix_ld--as-needed.patch b/debian/patches/01-fix_ld--as-needed.patch new file mode 100644 index 0000000..c28b7f1 --- /dev/null +++ b/debian/patches/01-fix_ld--as-needed.patch @@ -0,0 +1,73 @@ +From: Julian Taylor <jtay...@ubuntu.com> +Subject: fix build with ld --as-needed + libraries must be placed after objects needing their symbols +Origin: vendor +Bug-Debian: http://bugs.debian.org/656751 +Forwarded: no + +--- + test/run_tests.sh | 15 ++++++++------- + test/testgroup_geos/setup.sh | 3 ++- + test/testgroup_ogr/setup.sh | 3 ++- + test/testgroup_plain/setup.sh | 2 +- + 4 files changed, 13 insertions(+), 10 deletions(-) + +--- osmium.orig/test/run_tests.sh ++++ osmium/test/run_tests.sh +@@ -13,7 +13,8 @@ set -e + + CXX="g++" + CXXFLAGS="-g -Wall -Wextra -Wredundant-decls -Wdisabled-optimization -pedantic -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo" +-COMPILE="$CXX -I../include -I. $CXXFLAGS -lboost_unit_test_framework -o tests test_utils.cpp" ++LIBADD="-lboos_unit_test_framework" ++COMPILE="$CXX -I../include -I. $CXXFLAGS -o tests test_utils.cpp" + + if [ "x$1" = "x-v" ]; then + VALGRIND="valgrind --leak-check=full --show-reachable=yes" +@@ -30,8 +31,8 @@ if [ "x$1" = "x" ]; then + echo "\nTesting group $GROUP...\n" + . $DIR/setup.sh + FILES="test_main.cpp $DIR/*/test_*.cpp" +- echo $COMPILE $FLAGS $FILES +- $COMPILE $FLAGS $FILES ++ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD ++ $COMPILE $FLAGS $FILES $LIBS $LIBADD + $VALGRIND ./tests + done + else +@@ -41,14 +42,14 @@ else + if [ "x$2" = "x" ]; then + echo "\nTesting group $GROUP...\n" + FILES="test_main.cpp $DIR/*/test_*.cpp" +- echo $COMPILE $FLAGS $FILES +- $COMPILE $FLAGS $FILES ++ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD ++ $COMPILE $FLAGS $FILES $LIBS $LIBADD + $VALGRIND ./tests + else + echo "\nTesting file $2 in group $GROUP...\n" + FILES="-DSTAND_ALONE $DIR/$2" +- echo $COMPILE $FLAGS $FILES +- $COMPILE $FLAGS $FILES ++ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD ++ $COMPILE $FLAGS $FILES $LIBS $LIBADD + $VALGRIND ./tests + fi + fi +--- osmium.orig/test/testgroup_geos/setup.sh ++++ osmium/test/testgroup_geos/setup.sh +@@ -1 +1,2 @@ +-FLAGS="-DOSMIUM_WITH_GEOS `geos-config --cflags` `geos-config --libs`" ++FLAGS="-DOSMIUM_WITH_GEOS `geos-config --cflags`" ++LIBS="$-DOSMIUM_WITH_GEOS `geos-config --libs`" +--- osmium.orig/test/testgroup_ogr/setup.sh ++++ osmium/test/testgroup_ogr/setup.sh +@@ -1 +1,2 @@ +-FLAGS="-DOSMIUM_WITH_OGR `gdal-config --cflags` `gdal-config --libs`" ++FLAGS="-DOSMIUM_WITH_OGR `gdal-config --cflags`" ++LIBS="-DOSMIUM_WITH_OGR `gdal-config --libs`" +--- osmium.orig/test/testgroup_plain/setup.sh ++++ osmium/test/testgroup_plain/setup.sh +@@ -1 +1 @@ +-FLAGS="" ++FLAGS="`gdal-config --cflags`" diff --git a/debian/patches/series b/debian/patches/series index f9cb1ba..5167465 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 00-fix_typos.patch +01-fix_ld--as-needed.patch -- C++ framework for working with OSM data files _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits