[Pkg-sdl-commits] [libsdl2] 01/02: Use "dh_autoreconf" to support new architectures

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to branch master
in repository libsdl2.

commit d91ffc26fd589f507b7fd24fee18ead669638a92
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sun Mar 9 01:49:43 2014 +0000

    Use "dh_autoreconf" to support new architectures
---
 debian/changelog |  6 ++++++
 debian/control   |  1 +
 debian/rules     | 29 ++++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e78748d..1de334d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsdl2 (2.0.1+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Use "dh_autoreconf" to support new architectures
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sun, 09 Mar 2014 01:44:03 +0000
+
 libsdl2 (2.0.1+dfsg1-2) unstable; urgency=medium
 
   * Fix FTBFS on kFreeBSD.
diff --git a/debian/control b/debian/control
index 6542164..016c728 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Barry deFreese <bdefreese at debian.org>,
            Felix Geyer <fgeyer at debian.org>
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                dpkg-dev (>= 1.16.1~),
                libasound2-dev [linux-any],
                libdbus-1-dev,
diff --git a/debian/rules b/debian/rules
index 8dbfc5a..2e64cc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,34 @@ ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
 endif
 
 %:
-	dh $@ --parallel
+	dh $@ --with autoreconf --parallel
+
+override_dh_autoreconf:
+        # aclocal needs to include in specific order, and/or it seems that
+        # doesn't try to find .m4 files in /usr/share/aclocal at all.  Updates
+        # to both .m4 files and ltmain.sh (aclocal and libtoolize) are necessary
+        # to support new architectures aarch64 (arm64) and powerpc64le, and this
+        # seems the more straight way to achieve it.
+        #
+        # An alternative would be to just build-depend on libesd0-dev,
+        # libasound2-dev and libltdl-dev to provide the files "esd.m4 alsa.m4
+        # ltdl.m4" in /usr/share/aclocal, and not use the local "acinclude" dir
+        # at all, but this pull even more dependencies, and unneeded ones.
+        #
+        # Another equivalent alternative, but more verbose:
+        #
+        # ACLOCAL="cat acinclude/esd.m4 acinclude/alsa.m4 acinclude/ltdl.m4 \
+        #           /usr/share/aclocal/libtool.m4 \
+        #           /usr/share/aclocal/ltoptions.m4 \
+        #           /usr/share/aclocal/ltversion.m4 \
+        #           /usr/share/aclocal/ltsugar.m4 >> aclocal.m4; aclocal"
+        #          LIBTOOLIZE="libtoolize -f -i" dh_autoreconf --as-needed
+        #          autoreconf -- -I acinclude -f -i
+	AUTOHEADER=true ACLOCAL="aclocal --force --install -I /usr/share/aclocal/ -I acinclude" LIBTOOLIZE="libtoolize -fi" dh_autoreconf --as-needed
+        # To verify that it worked, grep should find these strings:
+        #
+        #rgrep -i aarch64 .
+        #rgrep -r powerpc64le .
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(confflags)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git