Work around weird build system failure with libffi, add missing dep on libffi

Package-Manager: portage-2.2.15/cvs/Linux x86_64

3 files changed, 16 insertions, 8 deletions

diff --git a/dev-lang/nqp/ChangeLog b/dev-lang/nqp/ChangeLog
index 37e57be9f02e..7ff3b94f6172 100644
--- a/dev-lang/nqp/ChangeLog
+++ b/dev-lang/nqp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/nqp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/ChangeLog,v 1.57 2014/12/20 09:01:39 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/ChangeLog,v 1.58 2015/01/23 03:50:21 patrick Exp $
+
+  23 Jan 2015; Patrick Lauer <patrick@gentoo.org> nqp-2014.12.ebuild:
+  Work around weird build system failure with libffi, add missing dep on libffi
 
 *nqp-2014.12 (20 Dec 2014)
 
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index b81073200e83..ecda13aa1585 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -9,6 +9,6 @@ EBUILD nqp-2014.08.ebuild 1452 SHA256 7a903e5657deb10e05e15c4ff789737b332683cc2e
 EBUILD nqp-2014.09.ebuild 1452 SHA256 f31035e37c3d0f7d793eb173326f9e7b0a261fa03f68a54ae8e11d687cc26cb3 SHA512 b5311c4d68b655b4b17536fa733d2a418711ade3d87567f228d641d35beae660b518a830cf3e3f74a80198d352533839e91d3c8cd4e25e0c5602a7e0550a78b7 WHIRLPOOL 02851f782f84214ccb6d219bc695eb7e88cfff32ba50f5b431d3a6c05d501a9f8e42587f2b846dbdf77042144a39e4c77bcfc599e22bcb9444ef59dd8ca44724
 EBUILD nqp-2014.10.ebuild 1452 SHA256 bac662b16cb3f4254a55531dbe25b1e6a4bd0597d666ed93db76df42daaee842 SHA512 e633b27bbb1e77791584e3c4e65080ed699dc5c9c8789b290f188a5b11615d424955684fff86db4efae73d409ec37ddb7c6780916555770e6b4e27de7409e766 WHIRLPOOL 9cd52b765b9625100fb23a18eceb4f6ef8aed5ba42359675c498f748fa7401effadceaa7e56079924ff665f7d539ccd2fbd6a4af865d67f6f0febc6731bd6abc
 EBUILD nqp-2014.11-r1.ebuild 1629 SHA256 8769c7531207bff56c957c78ad17f15bb478bcbdf0415dc82bb27786596c3de9 SHA512 b789d597d3be5e9a4f7752bec8e88e70f69db1159e062f02bddcd4803a1597ff769f5853c7f14627dcec0151bae5060f28d4823e00041a4641189dd5a65dc33a WHIRLPOOL ce1196885b3b5d582cbb4a1508e78fb2138ca6e4a6de85ce7850f54c5d81196e32ebd5c22b489034391148c71ec938f2d76801ae379c8f9f3da09859de21e42c
-EBUILD nqp-2014.12.ebuild 1626 SHA256 7aa5857abbd7b4dbea7369d1e6b44c3805c09f419d3c1029bc06ffa09e3d5575 SHA512 0c47b18db0e50a1fdb73e26240c04a923dbdfebec57b0537a0c400d445ccd6117d0810566e78be8e2b6986e087f289aec59870653a94d6bfda4e96c85ab09dc6 WHIRLPOOL 99e81bf8595cdcdbfea6d8c687d61c2e55d245c06e232a4e6a0bd4e3eb3717b2088dd859c12d12380def6128e0f4551dda130ea1ed837d66addb434c87360a52
-MISC ChangeLog 7547 SHA256 b303c13f5860a5dd017f09c19d87d42793a7f1126102907da707ea19f8d1526d SHA512 3c2ec9e38c081835fb536514bde689723444828b7569bb1e096b80abd6154e9924877d5f60584300580b362d9b669212a0f377ad336759340a4b395fcdc5a061 WHIRLPOOL 6cc578465d784297fef75ed9e071d245d5a5cd1687a374e4794025c26cbad2a8a765a33547a26181fa0174cece47a30a82d386a0116ecb1bf6b1320195f72cd4
+EBUILD nqp-2014.12.ebuild 1842 SHA256 cddb091fd09efd14a43752761ab74207042299520e5c71411c5e9fcac904149c SHA512 7a8a02baccaaed7edf7032ee0afd804fe1d713eff77840e7fef9b955b6b6ccd0c485b3a0765fb1f3f2f60e67c37b35a01a87de6c74d784618277a2c921a9a0e8 WHIRLPOOL 95b2e44525de0c9322b1d2dd96ddd65173f3a1a8cead793bb786043f78fbce38b3c527c2d775bcd0296040d27469757131c8a43a7b1a12d6377b2129b68d8669
+MISC ChangeLog 7698 SHA256 201cc80f27d2c64427698d581588fef7f50dd49fd46019c622635d92b7e7622d SHA512 e5a496342b38e897767ccdf4671c89642f9198c36f743ddeeec090172cd12e468ebec537a7a99ce8e2d7877f58c15fb784f98e908dd73aa609c18c828164c564 WHIRLPOOL c4f753ce16305b3d8a8219cb2a3414772bd89d84f940609589d24e95550719b9c0ebde8f657eaaed9b3a4c0c7fb4ee99bb267790853150b44fd56f336467879e
 MISC metadata.xml 404 SHA256 3e5dfb79d6f4a44b0fc997651ccde75103dcf25dd6aaa0f59a18489cd82cdd25 SHA512 0440da4fe44ec43ff8a88c16837d670825c2c02ed75e64d07cf325e8c101a29ba6532ac8af28579d089ae493cfa8ab2a380e4c534b4069babe15c2baa1238897 WHIRLPOOL a11b5e4adc6f2138d2b87619034347ab8f43aebe2673353f16c6623a981541ae366bc5eb6b2a05332de30b3291d241509f2bdc72153f3252bba539efb62edc7d
diff --git a/dev-lang/nqp/nqp-2014.12.ebuild b/dev-lang/nqp/nqp-2014.12.ebuild
index 680ee7b118f2..2cf30f89969d 100644
--- a/dev-lang/nqp/nqp-2014.12.ebuild
+++ b/dev-lang/nqp/nqp-2014.12.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2014.12.ebuild,v 1.1 2014/12/20 09:01:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqp/nqp-2014.12.ebuild,v 1.2 2015/01/23 03:50:21 patrick Exp $
 
 EAPI=5
 
 # still not working
 RESTRICT="test"
 
-inherit eutils multilib
+inherit eutils multilib versionator
 
 GITCRAP=64e7d41
 PARROT_VERSION="6.7.0"
@@ -24,7 +24,8 @@ REQUIRED_USE="|| ( parrot java moar )"
 
 RDEPEND="parrot? ( >=dev-lang/parrot-${PARROT_VERSION}:=[unicode] )
 	java? ( >=virtual/jre-1.7 )
-	moar? ( =dev-lang/moarvm-${PV} )"
+	moar? ( =dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.7 )
 	dev-lang/perl"
@@ -44,6 +45,10 @@ src_configure() {
 	# more dirty hack to allow building with newer gcc
 	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
 	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+
+	# horrible hackery, but we need to know where libffi hides its headers ...
+	libffi_path=$(echo /usr/lib64/libffi-*)
+	sed -i -e "s:/usr/lib64/libffi-3.1:${libffi_path}:" Makefile || die
 }
 
 src_compile() {