diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-11-07 12:06:24 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-11-07 12:06:24 +0100 |
| commit | 8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c (patch) | |
| tree | 59856dd54be721f3c3f4f49e43c9f335390f8fb0 | |
| parent | dev-libs/libcroco: Version bump (diff) | |
| download | gentoo-8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c.tar.gz gentoo-8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c.tar.bz2 gentoo-8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c.zip | |
net-libs/webkit-gtk: Fix ia64, bug #555504 by Émeric Maschino
Package-Manager: portage-2.2.23
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 | ||||
| -rw-r--r-- | 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 000000000000..6c88c49d8b9e --- /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 bdd69c138218..56b20ba3ec16 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" |