Package: am-utils
Version: 6.2+rc20110530-3.1
Followup-For: Bug #727316
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Use autotools-dev to update config.{sub,guess} for new arches.
  * Manually patch libtool.m4 to fix FTBFS on ppc64el.

Thanks for considering the patch.

Logan Rosen



-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-6-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 -u am-utils-6.2+rc20110530/debian/patches/series am-utils-6.2+rc20110530/debian/patches/series
--- am-utils-6.2+rc20110530/debian/patches/series
+++ am-utils-6.2+rc20110530/debian/patches/series
@@ -11,0 +12 @@
+libtool_ppc64el.patch
diff -u am-utils-6.2+rc20110530/debian/rules am-utils-6.2+rc20110530/debian/rules
--- am-utils-6.2+rc20110530/debian/rules
+++ am-utils-6.2+rc20110530/debian/rules
@@ -65,6 +65,7 @@
 	cp -f /usr/share/aclocal/libtool.m4 ./acinclude.m4
 	aclocal
 	libtoolize -f -c
+	dh_autotools-dev_updateconfig
 
 	./buildall -K
 
@@ -87,6 +88,7 @@
 #	find libamu -type l | xargs rm -f
 #	find amd -type l | xargs rm -f
 #	find fixmount -type l | xargs rm -f
+	dh_autotools-dev_restoreconfig
 	dh_auto_clean
 	rm -f debian/*.debhelper.log
 
only in patch2:
unchanged:
--- am-utils-6.2+rc20110530.orig/debian/patches/libtool_ppc64el.patch
+++ am-utils-6.2+rc20110530/debian/patches/libtool_ppc64el.patch
@@ -0,0 +1,26 @@
+--- a/m4/macros/libtool.m4
++++ b/m4/macros/libtool.m4
+@@ -1279,7 +1279,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*)
+@@ -1298,7 +1301,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*)

Reply via email to