[pkg-db-commits] [db5.3] 01/03: Fix the autoreconf invocation to support builds on new architectures (Closes: #750481)

[Ondrej Sury]

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

ondrej pushed a commit to branch debian-sid
in repository db5.3.

commit d02884bfa306ef87d60c8e596e57db6cf1bf3bdc
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jun 27 09:50:53 2014 +0200

    Fix the autoreconf invocation to support builds on new architectures (Closes: #750481)
---
 .../patches/008-autoconf-in-lang-sql-sqlite.patch  | 16 ++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 35 +++++++++++++++-------
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/debian/patches/008-autoconf-in-lang-sql-sqlite.patch b/debian/patches/008-autoconf-in-lang-sql-sqlite.patch
new file mode 100644
index 0000000..f79fc0a
--- /dev/null
+++ b/debian/patches/008-autoconf-in-lang-sql-sqlite.patch
@@ -0,0 +1,16 @@
+Index: db5.3-5.3.28/dist/s_config
+===================================================================
+--- db5.3-5.3.28.orig/dist/s_config
++++ db5.3-5.3.28/dist/s_config
+@@ -35,3 +35,11 @@ rm -rf autom4te.cache
+ chmod 755 configure
+ 
+ chmod 755 config.guess config.sub install-sh
++
++echo "autoconf: running autoconf to build configure (lang/sql/sqlite/)"
++cp aclocal.m4 ../lang/sql/sqlite/
++cd ../lang/sql/sqlite/
++rm -f configure
++autoconf
++cd ../../../dist/
++
diff --git a/debian/patches/series b/debian/patches/series
index e5be750..9e34d64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 006-mutex_alignment.patch
 007-link-sql-libs.patch
 mmap_extend-mode-requires-page-aligned-extends.patch
+008-autoconf-in-lang-sql-sqlite.patch
diff --git a/debian/rules b/debian/rules
index 495edb6..b7b669a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,22 +123,32 @@ bdbversion=5.3
 version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
-RECONF_FILES=config.hin configure aclocal/libtool.m4 aclocal/ltoptions.m4 \
-	     aclocal/ltversion.m4 config.guess config.sub install-sh ltmain.sh
+LIBTOOL_AUX_FILES=config.guess config.sub install-sh ltmain.sh
+LIBTOOL_MACROS_FILES=libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
+
+RECONF_FILES=dist/config.hin \
+             dist/configure \
+             $(patsubst %,dist/%,$(LIBTOOL_AUX_FILES)) \
+             $(patsubst %,dist/aclocal/%,$(LIBTOOL_MACROS_FILES)) \
+             lang/sql/sqlite/aclocal.m4 \
+             lang/sql/sqlite/configure \
+             $(patsubst %,lang/sql/sqlite/%,$(LIBTOOL_AUX_FILES))
 
 %:
 	dh $@ --with=autotools-dev $(DH_PLUGINS)
 
 override_dh_auto_configure:
 	if [ ! -d $(CURDIR)/debian/s_config ]; then \
-	  mkdir $(CURDIR)/debian/s_config/ $(CURDIR)/debian/s_config/aclocal/; \
+	  mkdir -p $(CURDIR)/debian/s_config/dist/aclocal/ \
+	           $(CURDIR)/debian/s_config/lang/sql/sqlite/; \
 	fi
 	for f in $(RECONF_FILES); do \
-	  if [ ! $(CURDIR)/debian/s_config/$$f ]; then \
-	    mv $(CURDIR)/dist/$$f $(CURDIR)/debian/s_config/; \
+	  if [ ! -f $(CURDIR)/debian/s_config/$$f ]; then \
+	    mv $(CURDIR)/$$f $(CURDIR)/debian/s_config/`dirname $$f`; \
 	  fi; \
 	done
-	libtoolize -cfi
+	cd dist && libtoolize -cfi
+	cd lang/sql/sqlite && libtoolize -cfi
 	cd dist && ./s_config
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild-test -- $(CONFIGURE_SWITCHES) --enable-test
@@ -152,12 +162,17 @@ endif
 	dh_auto_clean -Ddist -Bbuild-production
 	rm -f $(CURDIR)/debian/build_signature.txt
 	for f in $(RECONF_FILES); do \
-	  if [ -e $(CURDIR)/debian/s_config/$$f ]; then \
-	    mv $(CURDIR)/debian/s_config/$$f $(CURDIR)/dist/; \
+	  if [ -f $(CURDIR)/debian/s_config/$$f ]; then \
+	    mv $(CURDIR)/debian/s_config/$$f $(CURDIR)/`dirname $$f`; \
 	  fi; \
 	done
-	if [ -f $(CURDIR)/debian/s_config/ ]; then \
-	  rmdir -f $(CURDIR)/debian/s_config/aclocal/ $(CURDIR)/debian/s_config/; \
+	if [ -d $(CURDIR)/debian/s_config/ ]; then \
+	  rmdir $(CURDIR)/debian/s_config/dist/aclocal/ \
+	        $(CURDIR)/debian/s_config/dist/ \
+	        $(CURDIR)/debian/s_config/lang/sql/sqlite/ \
+	        $(CURDIR)/debian/s_config/lang/sql/ \
+	        $(CURDIR)/debian/s_config/lang/ \
+	        $(CURDIR)/debian/s_config/; \
 	fi
 
 override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db5.3.git