[osm2pgsql] 01/02: Drop --without-lockfree configure option, no longer needed.

[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 dcda35f7fdac6c86766f68b23d6518ce8e23829e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 30 23:56:00 2015 +0200

    Drop --without-lockfree configure option, no longer needed.
---
 debian/changelog | 6 ++++++
 debian/rules     | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2570da9..632f9a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm2pgsql (0.87.3-2) UNRELEASED; urgency=medium
+
+  * Drop --without-lockfree configure option, no longer needed.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 30 Apr 2015 23:54:59 +0200
+
 osm2pgsql (0.87.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index a3d5f48..fa13a9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,17 +12,13 @@ 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 -- $(CONFIGURE_OPTS) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+	dh_auto_configure -- 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