[Pkg-apache-commits] r909 - in /trunk/apr: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Sun May 10 08:03:00 2009
New Revision: 909

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=909
Log:
Force use of bash in the embedded libtool

Modified:
    trunk/apr/changelog
    trunk/apr/rules

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=909&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sun May 10 08:03:00 2009
@@ -1,5 +1,6 @@
 apr (1.3.3-4) UNRELEASED; urgency=low
 
+  [ Ryan Niebur ]
   * change the -dbg package's section to debug
   * Fix building with newer libtool, thanks to John Wright for the patch
     (Closes: #526346)
@@ -7,6 +8,9 @@
     architectures, fixing FTBFS (Closes: #520857)
   * support nocheck in DEB_BUILD_OPTIONS
   * Debian Policy 3.8.1
+
+  [ Stefan Fritsch ]
+  * Force use of bash in the embedded libtool
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 02 May 2009 00:09:22 -0700
 

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=909&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sun May 10 08:03:00 2009
@@ -53,7 +53,10 @@
 	dh_testdir
 	mkdir -p $(BUILDDIR)/docs
 	./buildconf
-	cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics
+	# 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) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFFLAGS) CONFIG_SHELL=/bin/bash /bin/bash ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout=Debian --includedir=\$${prefix}/usr/include/apr-1.0 --with-installbuilddir=\$${prefix}/usr/share/apr-1.0/build  --enable-nonportable-atomics
 	# Determine whether upstream's configure gives the same definition of apr_ino_t as we had until 1.2.11-1
 	rm -f debian/ino_t_test
 	gcc -I$(CURDIR)/include -I$(BUILDDIR)/include `$(BUILDDIR)/apr-1-config --cppflags` -o debian/ino_t_test debian/ino_t_test.c