Comment 7 for bug 1349386

Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

And here the second one
From ade2b3f6f54eae4d94bb2e342e19f770566a5bf9 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <email address hidden>
Date: Fri, 1 Aug 2014 10:48:46 +0200
Subject: [PATCH 2/2] Cherry-pick ubuntu ppc64el patch

---
 debian/changelog | 4 ++++
 debian/patches/ppc64el.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series | 1 +
 3 files changed, 31 insertions(+)
 create mode 100644 debian/patches/ppc64el.patch

diff --git a/debian/changelog b/debian/changelog
index 91bf9f2..d2c4ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ libvncserver (0.9.9+dfsg-6) UNRELEASED; urgency=medium
   * Drop the libpng12-dev build conflict, relying instead on a better
     --without-png configure flag

+ [ Matthias Klose ]
+ * debian/patches/ppc64el.patch
+ - Patch acinclude.m4 for ppc64el.
+
  -- Luca Falavigna <email address hidden> Tue, 01 Jul 2014 21:05:18 +0200

 libvncserver (0.9.9+dfsg-5) unstable; urgency=medium
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
new file mode 100644
index 0000000..fde68ec
--- /dev/null
+++ b/debian/patches/ppc64el.patch
@@ -0,0 +1,26 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1137,7 +1137,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*)
+@@ -1153,7 +1156,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 --git a/debian/patches/series b/debian/patches/series
index 1498448..aa2f426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ no_x11vnc_subdir.patch
 format_string.patch
 multiarch.patch
 listenSock.patch
+ppc64el.patch
--
1.9.1

----

If we get all of them two accepted we can plain sync the package, otherwise another merge will be needed, and I'll provide it