[pkg-bacula-commits] [bacula] 07/15: Updated debian/patches/ppc64el-libtoolize.patch

[Carsten Leonhardt]

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

cl-guest pushed a commit to branch master
in repository bacula.

commit a008d47b54187716109754c4a8e9803f3ed0db66
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Jul 21 11:09:43 2015 +0200

    Updated debian/patches/ppc64el-libtoolize.patch
---
 debian/patches/ppc64el-libtoolize.patch | 50 ++++-----------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

diff --git a/debian/patches/ppc64el-libtoolize.patch b/debian/patches/ppc64el-libtoolize.patch
index 9715df1..b794469 100644
--- a/debian/patches/ppc64el-libtoolize.patch
+++ b/debian/patches/ppc64el-libtoolize.patch
@@ -2,53 +2,15 @@ Description: Update "libtool" harder.
 Author: Dimitri John Ledkov <xnox at ubuntu.com>
 Bug-Debian: 758125
 
---- bacula-5.2.6+dfsg.orig/autoconf/config.guess
-+++ bacula-5.2.6+dfsg/autoconf/config.guess
-@@ -945,6 +945,12 @@ EOF
-     parisc64:Linux:*:* | hppa64:Linux:*:*)
- 	echo hppa64-unknown-linux-gnu
+--- a/autoconf/config.guess
++++ b/autoconf/config.guess
+@@ -1001,6 +1001,9 @@
+     ppcle:Linux:*:*)
+ 	echo powerpcle-unknown-linux-${LIBC}
  	exit ;;
 +    ppc64el:Linux:*:*)
 +	echo powerpc64le-unknown-linux-${LIBC}
 +	exit ;;
-+    ppcle:Linux:*:*)
-+	echo powerpcle-unknown-linux-${LIBC}
-+	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
+ 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
  	exit ;;
---- bacula-5.2.6+dfsg.orig/autoconf/libtool/libtool.m4
-+++ bacula-5.2.6+dfsg/autoconf/libtool/libtool.m4
-@@ -1268,7 +1268,7 @@ ia64-*-hpux*)
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -1282,7 +1282,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- 	  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*)
-@@ -1301,7 +1304,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- 	  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*)

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