From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B1B301384B4 for ; Sat, 7 Nov 2015 11:07:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D2D421C01A; Sat, 7 Nov 2015 11:07:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C264521C01A for ; Sat, 7 Nov 2015 11:07:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 869BE3406C0 for ; Sat, 7 Nov 2015 11:07:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0D7F19F for ; Sat, 7 Nov 2015 11:07:08 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1446894384.8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c X-VCS-Branch: master Date: Sat, 7 Nov 2015 11:07:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31e81b89-315c-4cde-9267-35e796d81032 X-Archives-Hash: f7bf3fb0d323474c09f8e55d627f92a1 commit: 8d2af1c66e3ae2e6e8b42ac6225530f90dcb933c Author: Pacho Ramos gentoo org> AuthorDate: Sat Nov 7 11:06:24 2015 +0000 Commit: Pacho Ramos gentoo 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"