Attachment #431592 for bug #580732




diff -Naur a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
--- a/tools/build/Makefile-Moar.in     2016-02-02 14:27:13.000000000 +0100
+++ b/tools/build/Makefile-Moar.in     2016-04-22 15:01:35.338534944 +0200
@@ -87,11 +87,11 @@
       $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
           -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
           -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
-          -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
+                      -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
       $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
           -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
           -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
-          -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
+                      -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
       $(M_LD) @moar::ldswitch@ -L@moar::libdir@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) -lmoar @moarimplib@

 $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp

Lines 5-12 Link Here

(-)a/dev-lang/rakudo/metadata.xml (-2 / +5 lines)
5	<email>patrick@gentoo.org</email>	5	<email>patrick@gentoo.org</email>
6	<name>Patrick Lauer</name>	6	<name>Patrick Lauer</name>
7	</maintainer>	7	</maintainer>
8	<maintainer type="project">	8	<maintainer type="project">
9	<email>perl@gentoo.org</email>	9	<email>perl@gentoo.org</email>
10	<name>Gentoo Perl Project</name>	10	<name>Gentoo Perl Project</name>
11	</maintainer>	11	</maintainer>
		12	<use>
		13	<flag name="moar">Use the MoarVM as backend</flag>
		14	</use>
12	</pkgmetadata>	15	</pkgmetadata>




# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

DESCRIPTION="A compiler for the Perl 6 programming language"
HOMEPAGE="http://rakudo.org"

if [[ ${PV} == "9999" ]]; then
       EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
       inherit git-r3
else
       SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
fi

LICENSE="Artistic-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# TODO: add USE="javascript" once that's usable in nqp
IUSE="java moar test"

RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
DEPEND="${RDEPEND}
       >=dev-lang/perl-5.10"

REQUIRED_USE="|| ( java moar )"
#PATCHES=(${FILESDIR}/${PV})
PATCHES=( "${FILESDIR}/${P}-Makefile.in.patch" )

src_prepare() {
       eapply "${PATCHES[@]}"
       echo "DESTDIR   = ${D}" > "${T}/Makefile-Moar.in" || die
       cat "${S}/tools/build/Makefile-Moar.in" >> "${T}/Makefile-Moar.in" || die
       mv "${T}/Makefile-Moar.in" "${S}/tools/build/Makefile-Moar.in" || die
       eapply_user
}

src_configure() {
       local backends
       use java && backends+="jvm,"

Return to bug 580732

Line 0 Link Here

(-)a/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch (+17 lines)
	1	diff -Naur a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
	2	--- a/tools/build/Makefile-Moar.in 2016-02-02 14:27:13.000000000 +0100
	3	+++ b/tools/build/Makefile-Moar.in 2016-04-22 15:01:35.338534944 +0200
	4	@@ -87,11 +87,11 @@
	5	$(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
	6	-I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
	7	-I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \
	8	- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
	9	+ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
	10	$(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
	11	-I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
	12	-I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \
	13	- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
	14	+ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
	15	$(M_LD) @moar::ldswitch@ -L@moar::libdir@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) -lmoar @moarimplib@
	16
	17	$(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp

Line 0 Link Here

(-)a/dev-lang/rakudo/rakudo-2016.03-r1.ebuild (+41 lines)
	1	# Copyright 1999-2016 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License v2
	3	# $Id$
	4
	5	EAPI=6
	6
	7	DESCRIPTION="A compiler for the Perl 6 programming language"
	8	HOMEPAGE="http://rakudo.org"
	9
	10	if [[ ${PV} == "9999" ]]; then
	11	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
	12	inherit git-r3
	13	else
	14	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
	15	fi
	16
	17	LICENSE="Artistic-2"
	18	SLOT="0"
	19	KEYWORDS="~amd64 ~x86"
	20	# TODO: add USE="javascript" once that's usable in nqp
	21	IUSE="java moar test"
	22
	23	RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
	24	DEPEND="${RDEPEND}
	25	>=dev-lang/perl-5.10"
	26
	27	REQUIRED_USE="\|\| ( java moar )"
	28	#PATCHES=(${FILESDIR}/${PV})
	29	PATCHES=( "${FILESDIR}/${P}-Makefile.in.patch" )
	30
	31	src_prepare() {
	32	eapply "${PATCHES[@]}"
	33	echo "DESTDIR = ${D}" > "${T}/Makefile-Moar.in" \|\| die
	34	cat "${S}/tools/build/Makefile-Moar.in" >> "${T}/Makefile-Moar.in" \|\| die
	35	mv "${T}/Makefile-Moar.in" "${S}/tools/build/Makefile-Moar.in" \|\| die
	36	eapply_user
	37	}
	38
	39	src_configure() {
	40	local backends
	41	use java && backends+="jvm,"