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 6F39F138010 for ; Sat, 15 Sep 2012 05:09:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A682221C014; Sat, 15 Sep 2012 05:08:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6866A21C014 for ; Sat, 15 Sep 2012 05:08:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1CE933CEF0 for ; Sat, 15 Sep 2012 05:08:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5E6DAE543F for ; Sat, 15 Sep 2012 05:08:41 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1347685649.7babffb45dd196c25ecff31da4a5a1cb1d17a3dd.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/gjs/, dev-libs/gjs/files/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/gjs/files/gjs-1.33.10-gold.patch dev-libs/gjs/gjs-1.33.10.ebuild X-VCS-Directories: dev-libs/gjs/ dev-libs/gjs/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 7babffb45dd196c25ecff31da4a5a1cb1d17a3dd X-VCS-Branch: master Date: Sat, 15 Sep 2012 05:08:41 +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: 96c980b6-65af-477b-b3b3-4f7f3f4c0eed X-Archives-Hash: 847e9d4499e14796112f4cf775d2fafe commit: 7babffb45dd196c25ecff31da4a5a1cb1d17a3dd Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sat Sep 15 05:07:29 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Sat Sep 15 05:07:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7babffb4 dev-libs/gjs: fix linking with gold Patch submitted upstream at https://bugzilla.gnome.org/show_bug.cgi?id=684064 --- dev-libs/gjs/files/gjs-1.33.10-gold.patch | 31 +++++++++++++++++++++++++++++ dev-libs/gjs/gjs-1.33.10.ebuild | 5 +++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dev-libs/gjs/files/gjs-1.33.10-gold.patch b/dev-libs/gjs/files/gjs-1.33.10-gold.patch new file mode 100644 index 0000000..a2da173 --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.33.10-gold.patch @@ -0,0 +1,31 @@ +From 27969620b7c357bbe7db76a0582638723e417ca7 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sat, 15 Sep 2012 00:56:14 -0400 +Subject: [PATCH] build: Explicitly require libffi + +In >=gobject-introspection-1.33.2, libffi was moved from Requires to +Requires.private. Since gjs directly uses ffi functions, a missing +PKG_CHECK_MODULES for libffi results in build failure when using GNU +gold as the linker. + +https://bugzilla.gnome.org/show_bug.cgi?id=684064 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5c13722..9564a33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -121,7 +121,7 @@ CFLAGS="$save_CFLAGS" + GOBJECT_INTROSPECTION_REQUIRE([1.33.10]) + + common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs185" +-gjs_packages="gobject-introspection-1.0 $common_packages" ++gjs_packages="gobject-introspection-1.0 libffi $common_packages" + gjs_cairo_gobject_packages="cairo-gobject $common_packages" + gjs_cairo_packages="cairo $common_packages" + gjs_dbus_packages="dbus-glib-1 $common_packages" +-- +1.7.12 + diff --git a/dev-libs/gjs/gjs-1.33.10.ebuild b/dev-libs/gjs/gjs-1.33.10.ebuild index 2c0e6cd..45ba3fd 100644 --- a/dev-libs/gjs/gjs-1.33.10.ebuild +++ b/dev-libs/gjs/gjs-1.33.10.ebuild @@ -7,7 +7,7 @@ GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_DEPEND="2" -inherit gnome2 pax-utils python virtualx +inherit autotools eutils gnome2 pax-utils python virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -51,6 +51,9 @@ pkg_setup() { } src_prepare() { + # https://bugzilla.gnome.org/show_bug.cgi?id=684064 + epatch "${FILESDIR}/${PN}-1.33.10-gold.patch" + eautoreconf gnome2_src_prepare python_convert_shebangs 2 "${S}"/scripts/make-tests }