[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Pacho Ramos]

commit:     8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 11:06:24 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 11:06:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2af1c6

net-libs/webkit-gtk: Fix ia64, bug #555504 by Émeric Maschino

Package-Manager: portage-2.2.23

 .../files/webkit-gtk-2.8.5-fix-ia64-build.patch     | 21 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild         | 10 +++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch 
b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
new file mode 100644
index 0000000..6c88c49
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,6 +98,8 @@
+     set(WTF_CPU_PPC64LE 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*")
+     set(WTF_CPU_HPPA 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
++    set(WTF_CPU_IA64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
+     set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -1147,6 +1147,7 @@
+     endif ()
+ elseif (WTF_CPU_ARM64)
+ elseif (WTF_CPU_HPPA)
++elseif (WTF_CPU_IA64)
+ elseif (WTF_CPU_PPC)
+ elseif (WTF_CPU_PPC64)
+ elseif (WTF_CPU_PPC64LE)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index bdd69c1..56b20ba 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -135,11 +135,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # Debian patches to fix support for some arches
-       # https://bugs.webkit.org/show_bug.cgi?id=129540
-       epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-       # https://bugs.webkit.org/show_bug.cgi?id=129542
-       epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+       # https://bugs.gentoo.org/show_bug.cgi?id=555504
+       epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
 
        # https://bugs.webkit.org/show_bug.cgi?id=148379
        epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
@@ -157,6 +154,9 @@ src_configure() {
        # It does not compile on alpha without this in LDFLAGS
        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
        use alpha && append-ldflags "-Wl,--no-relax"
+       
+       # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+       use ia64 && append-ldflags "-Wl,--no-as-needed"
 
        # Sigbuses on SPARC with mcpu and co., bug #???
        use sparc && filter-flags "-mvis"