[apr] 02/02: re-add logic to force bash in libtool

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit 5cd9d42a20e1678865ef02927fe053ccc6278d7a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Nov 23 00:21:24 2013 +0100

    re-add logic to force bash in libtool
---
 debian/changelog | 4 ++++
 debian/rules     | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e6e75af..a1bf094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 apr (1.5.0-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Re-add the logic to force use of bash for configure/libtool. Otherwise,
+    if the package is build with /bin/sh -> /bin/bash, the shipped libtool
+    won't work on systems with /bin/sh -> /bin/dash. This got lost in
+    1.4.8-2. Closes: #730196
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 16 Nov 2013 18:31:00 +0100
 
diff --git a/debian/rules b/debian/rules
index f6dcbf6..3335e4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,10 @@ override_dh_auto_configure:
 	mkdir -p $(BUILDDIR)/docs
 	for f in $(SAVE_FILES) ; do [ -e $$f.dr-orig ] || cp -p $$f $$f.dr-orig ; done
 	./buildconf
-	cd $(BUILDDIR) && $(CURDIR)/configure $(CONFFLAGS)
+	# We need to force the use of bash here. Otherwise, if apr is built with
+	# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
+	# where /bin/sh -> /bin/dash.
+	cd $(BUILDDIR) && CONFIG_SHELL=/bin/bash /bin/bash $(CURDIR)/configure $(CONFFLAGS)
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	if grep -q APR_HAS_POSIXSEM_SERIALIZE.*0 $(BUILDDIR)/include/apr.h ;\
 	then \

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