Package: libstroke
Version: 0.5.1-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch trusty
libstroke fails to build on the Ubuntu arm64 and ppc64el architectures;
both of these are at varying stages of being added to Debian too.
Firstly, config.guess and config.sub need to be updated, which can be
done automatically using autotools-dev (it would probably be a good idea
to drop your manual .diff.gz patches to these files as well).
Secondly, ppc64el needs a patch to the libtool macros, which I've
applied manually here. This is not ideal; it'd be better to do that
automatically with dh_autoreconf (which would also handle the previous
case). However, when I tried, I got a failure because the AM_PATH_GTK
macro wasn't available; perhaps this needs some m4_ifdef trickery or
similar. If you do this, it would probably be a lot more comprehensible
to switch to the 3.0 (quilt) source format and drop all the autotools
patches except for those that apply to true source files: in this case
that would just be */Makefile.am.
* Use autotools-dev to update config.* for new ports.
* Add ppc64el support to libtool macros from the Debian libtool package.
diff -u libstroke-0.5.1/aclocal.m4 libstroke-0.5.1/aclocal.m4
--- libstroke-0.5.1/aclocal.m4
+++ libstroke-0.5.1/aclocal.m4
@@ -1330,7 +1330,7 @@
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -1340,7 +1340,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1356,7 +1359,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*)
diff -u libstroke-0.5.1/configure libstroke-0.5.1/configure
--- libstroke-0.5.1/configure
+++ libstroke-0.5.1/configure
@@ -3674,7 +3674,7 @@
rm -rf conftest*
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3688,7 +3688,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -3704,7 +3707,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*)
diff -u libstroke-0.5.1/debian/rules libstroke-0.5.1/debian/rules
--- libstroke-0.5.1/debian/rules
+++ libstroke-0.5.1/debian/rules
@@ -3,6 +3,7 @@
build: build-stamp
build-stamp:
dh_testdir
+ dh_autotools-dev_updateconfig
./configure --prefix=/usr --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib
# Patch the generated libtool to avoid passing -rpath when linking,
@@ -22,6 +23,7 @@
[ ! -f Makefile ] || $(MAKE) distclean
+ dh_autotools-dev_restoreconfig
dh_clean
# Build architecture-independent files here.
diff -u libstroke-0.5.1/debian/control libstroke-0.5.1/debian/control
--- libstroke-0.5.1/debian/control
+++ libstroke-0.5.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hamish Moffatt <ham...@debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), libx11-dev, libice-dev, libsm-dev
+Build-Depends: debhelper (>= 4), autotools-dev, libx11-dev, libice-dev,
libsm-dev
Package: libstroke0
Architecture: any
Thanks,
--
Colin Watson [cjwat...@ubuntu.com]
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
