[osm2pgsql] 01/09: Don't use --without-lockfree option, link boost_atomic explicitly instead.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit f66af9dbf216094da9beab3fede9c6e6528190b8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 1 19:09:29 2015 +0200

    Don't use --without-lockfree option, link boost_atomic explicitly instead.
---
 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0ed9c4a..28ca951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm2pgsql (0.87.3-4) UNRELEASED; urgency=medium
+
+  * Don't use --without-lockfree option, link boost_atomic explicitly instead.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 May 2015 19:08:56 +0200
+
 osm2pgsql (0.87.3-3) unstable; urgency=medium
 
   * Use --without-lockfree configure option on problematic architectures,
diff --git a/debian/rules b/debian/rules
index a3d5f48..d17aaa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ CFLAGS += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel mips mipsel powerpc ppc64el s390x sparc alpha hppa ppc64"))
-        CONFIGURE_OPTS += --without-lockfree
+        LDFLAGS += -lboost_atomic
 endif
 
 %:

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