[osm2pgsql] 01/02: Use --without-lockfree configure option only on architectures where the build fails otherwise. The option introduces a performance penalty undesirable on the primary architectures.

[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 ac56ce4b5278385bd19f1e3be4502985fe43e473
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Feb 24 12:37:55 2015 +0100

    Use --without-lockfree configure option only on architectures where the build fails otherwise. The option introduces a performance penalty undesirable on the primary architectures.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 015d1d9..2fb28dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osm2pgsql (0.87.2-1~exp2) UNRELEASED; urgency=medium
+
+  * Use --without-lockfree configure option only on architectures where the
+    build fails otherwise. The option introduces a performance penalty
+    undesirable on the primary architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 24 Feb 2015 12:36:07 +0100
+
 osm2pgsql (0.87.2-1~exp1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index e15cc8b..a8ca692 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,19 +4,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 # Verbose test output
 export VERBOSE=1
 
 CFLAGS += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
+ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel mips mipsel powerpc ppc64el s390x hppa ppc64"))
+        CONFIGURE_OPTS += --without-lockfree
+endif
+
 %:
 	dh $@ \
 		--with autoreconf \
 		--parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --without-lockfree CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+	dh_auto_configure -- $(CONFIGURE_OPTS) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
 override_dh_auto_test:
 	dh_auto_test || echo "Ignoring test failures"

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