summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Seiti Furusato <ferseiti@br.ibm.com>2014-07-31 13:54:29 -0400
committerHans-Christoph Steiner <hans@eds.org>2014-07-31 14:26:13 -0400
commit69fbae2bebf65ac79e96d96d312669e9c893f55f (patch)
tree8789b320efd85f80488742c013e86b147c8c8a6b
parent942e3ff7bdd46d1ec5eab45984d79273d6d06a42 (diff)
use autoreconf and autotools-dev to build on new architectures
The package sqlcipher fails to build from source on ppc64el, because config.{guess,sub} are not updated during build. Adding dh_autotools-dev to the build would solve that case. However, as autoconf also being used, I thought it would also be convenient to replace it by a full dh_autoreconf. OBS: Using only dh_autoreconf produces no effect over config.{guess,sub}, since automake is not in use for the source pkg available. The patch attached contains the modifications aforementioned, and are in accordance with the following guide: https://wiki.debian.org/Autoreconf patch from https://bugs.debian.org/755939
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules5
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index d3792ed..4f608c9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sqlcipher
Section: devel
Priority: optional
Maintainer: Hans-Christoph Steiner <hans@eds.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.5-dev, libssl-dev
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3), autotools-dev, dh-autoreconf, chrpath, libreadline-dev, tcl8.5-dev, libssl-dev
Build-Conflicts: tcl8.4, tcl8.4-dev
Homepage: http://sqlcipher.net/
Standards-Version: 3.9.4
diff --git a/debian/rules b/debian/rules
index 1c2bb30..fbbe723 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,8 @@ export CFLAGS += -O2 -fno-strict-aliasing \
configure: configure-stamp
configure-stamp:
dh_testdir
- autoconf
+ dh_autotools-dev_updateconfig
+ dh_autoreconf
echo CFLAGS = $$CFLAGS
./configure --prefix=/usr --mandir="/usr/share/man" \
$(confflags) --enable-threadsafe \
@@ -62,6 +63,8 @@ clean:
rm -f config.log config.h pkgIndex.tcl configure
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.h
+ dh_autotools-dev_restoreconfig
+ dh_autoreconf_clean
dh_clean
install: build