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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 43a929cc9dfb27c9afd3061f3b86989742a8f5cd
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri May 1 11:21:58 2015 +0200

    Revert "Drop --without-lockfree configure option, no longer needed."
    
    This reverts commit dcda35f7fdac6c86766f68b23d6518ce8e23829e.
    
    Conflicts:
        debian/changelog
---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a5785c3..38531a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osm2pgsql (0.87.3-3) UNRELEASED; urgency=medium
+
+  * Use --without-lockfree configure option on problematic architectures,
+    still required despite upstream claims.
+
+ -- Bas Couwenberg <sebas...@debian.org>  Fri, 01 May 2015 11:20:11 +0200
+
 osm2pgsql (0.87.3-2) unstable; urgency=medium
 
   * Drop --without-lockfree configure option, no longer needed.
diff --git a/debian/rules b/debian/rules
index fa13a9e..a3d5f48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,17 @@ export VERBOSE=1
 CFLAGS += $(CPPFLAGS)
 CXXFLAGS += $(CPPFLAGS)
 
+ifneq (,$(findstring $(DEB_HOST_ARCH),"arm64 armel mips mipsel powerpc ppc64el 
s390x sparc alpha hppa ppc64"))
+        CONFIGURE_OPTS += --without-lockfree
+endif
+
 %:
        dh $@ \
                --with autoreconf \
                --parallel
 
 override_dh_auto_configure:
-       dh_auto_configure -- 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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to