Package: gyoto
Version: 0.1.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch
Dear Maintainer,
There are config.{sub,guess} updates and libtool updates necessary to fix
FTBFSes on the arm64 and ppc64el architectures in Ubuntu.
In Ubuntu, the attached patch was applied to achieve the following:
* Manually patch libtool files to add support for ppc64el.
* Use autotools-dev to update config.{sub,guess} for new arches.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: jessie/sid
APT prefers utopic-updates
APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500,
'utopic'), (100, 'utopic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-24-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gyoto-0.1.0/debian/control gyoto-0.1.0/debian/control
--- gyoto-0.1.0/debian/control 2013-08-03 17:00:55.000000000 -0400
+++ gyoto-0.1.0/debian/control 2014-05-17 18:58:39.000000000 -0400
@@ -4,7 +4,7 @@
Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org>
Uploaders: Thibaut Paumard <thib...@debian.org>
Build-Depends: debhelper (>= 7.0.50~), yorick-dev, yorick-yutils,
- libxerces-c-dev, libcfitsio3-dev, libudunits2-dev
+ libxerces-c-dev, libcfitsio3-dev, libudunits2-dev, autotools-dev
Build-Depends-Indep: doxygen, doxygen-latex
Standards-Version: 3.9.4
Vcs-Git: git://git.debian.org/git/debian-science/packages/gyoto.git
diff -Nru gyoto-0.1.0/debian/patches/libtool-ppc64el gyoto-0.1.0/debian/patches/libtool-ppc64el
--- gyoto-0.1.0/debian/patches/libtool-ppc64el 1969-12-31 19:00:00.000000000 -0500
+++ gyoto-0.1.0/debian/patches/libtool-ppc64el 2014-05-08 01:57:54.000000000 -0400
@@ -0,0 +1,52 @@
+--- a/configure
++++ b/configure
+@@ -6877,7 +6877,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*)
+@@ -6896,7 +6899,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*|s390*-*tpf*)
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1326,7 +1326,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*)
+@@ -1345,7 +1348,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*|s390*-*tpf*)
diff -Nru gyoto-0.1.0/debian/patches/series gyoto-0.1.0/debian/patches/series
--- gyoto-0.1.0/debian/patches/series 2013-08-03 16:58:13.000000000 -0400
+++ gyoto-0.1.0/debian/patches/series 2014-05-08 01:56:47.000000000 -0400
@@ -1,2 +1,3 @@
interpreter-path
no-utf8
+libtool-ppc64el
diff -Nru gyoto-0.1.0/debian/rules gyoto-0.1.0/debian/rules
--- gyoto-0.1.0/debian/rules 2013-08-03 16:58:13.000000000 -0400
+++ gyoto-0.1.0/debian/rules 2014-05-08 01:40:36.000000000 -0400
@@ -46,6 +46,7 @@
build-stamp:
dh_testdir -a
+ dh_autotools-dev_updateconfig
./configure $(configure_flags) --disable-doc
make COPT_DEFAULT="" \
Y_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
@@ -74,6 +75,7 @@
dh $@
configure-stamp:
+ dh_autotools-dev_updateconfig
./configure --without-lorene --prefix=/usr
touch configure-stamp
@@ -81,6 +83,7 @@
dh_testdir
./configure $(configure_flags) --enable-doc
make distclean
+ dh_autotools-dev_restoreconfig
dh_clean doc-stamp build-stamp
override_dh_auto_test:
