(lang/rakudo-star) make now goes further (No moar now)

[Makoto Fujiwara (mef) <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara (mef) <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Dec 30 13:02:03 2020 +0900
Changeset:	7d6d29d091ad4184034aaf94db3fc2b254c7e938

Modified Files:
	rakudo-star/Makefile
	rakudo-star/TODO
	rakudo-star/distinfo
	rakudo-star/patches/patch-lib_actions_install.bash

Log Message:
(lang/rakudo-star) make now goes further (No moar now)

- have DESTDIR, PATH environment to install.bash
- Update TODO (for current error message)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7d6d29d091ad4184034aaf94db3fc2b254c7e938

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rakudo-star/Makefile                               | 12 ++++++-----
 rakudo-star/TODO                                   | 23 ++++++++++++++--------
 rakudo-star/distinfo                               |  2 +-
 rakudo-star/patches/patch-lib_actions_install.bash | 19 +++++++++++++-----
 4 files changed, 37 insertions(+), 19 deletions(-)

diffs:
diff --git a/rakudo-star/Makefile b/rakudo-star/Makefile
index 3e8ebbb376..f399a40376 100644
--- a/rakudo-star/Makefile
+++ b/rakudo-star/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE=	https://rakudo.org/
 COMMENT=	Perl 6 reference implementation
 LICENSE=	artistic-2.0
 
-#AKE_JOBS_SAFE=	no
+BUILD_DEPENDS+=	MoarVM>=2020.10:../../devel/MoarVM
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -34,15 +34,17 @@ SUBST_CLASSES+=		make
 SUBST_MESSAGE.make=	Some needs make, the other needs gmake
 SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	lib/actions/install.bash
-SUBST_SED.make=		-e 's,@@GMAKE@@,${PREFIX}/bin/gmake,g'
+#UBST_SED.make=		-e 's,@@GMAKE@@,${PREFIX}/bin/gmake,g'
+SUBST_VARS.make=	DESTDIR PREFIX
 
 do-configure:
-	(cd ${WRKSRC};  ./bin/rstar install)
+	(cd ${WRKSRC};  env DESTDIR=${DESTDIR} ./bin/rstar install core)
+	(cd ${WRKSRC};  env DESTDIR=${DESTDIR} ./bin/rstar install modules)
 
 do-build:
-	(cd ${WRKSRC};  ${MAKE})
+#	(cd ${WRKSRC};  ${MAKE})
 
-#do-install:
+do-install:
 #	(cd ${WRKSRC};  ${GMAKE} install)
 
 
diff --git a/rakudo-star/TODO b/rakudo-star/TODO
index a2723cc1a4..19c69cc060 100644
--- a/rakudo-star/TODO
+++ b/rakudo-star/TODO
@@ -10,12 +10,19 @@
 
 current error messages are:
 
-Found /tmp/wip/rakudo-star/work/rakudo-star-2020.10/bin/moar version 2020.10, which is new enough.
-Cleaning up ...
-You can now use '/usr/pkg/bin/gmake' to build NQP.
-After that, '/usr/pkg/bin/gmake test' will run some tests and
-'/usr/pkg/bin/gmake install' will install NQP.
-make[2]: "/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.uwgf1qCj/Makefile" line 27: Need an operator
-make[2]: "/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.uwgf1qCj/Makefile" line 29: Need an operator
-....
+perl -MExtUtils::Command -e cp 3rdparty/dyncall/dyncall/*.h "/export/CHROOT/tmp/wip/rakudo-star/work/.destdir/export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/include/dyncall"
+perl -MExtUtils::Command -e cp 3rdparty/dyncall/dyncallback/*.h "/export/CHROOT/tmp/wip/rakudo-star/work/.destdir/export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/include/dyncall"
+[2020-12-30T12:54:57] [INFO]  Starting build on NQP
+[2020-12-30T12:54:57] [NOTIC] Using /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu as working directory
+fatal: not in a git directory
+fatal: not in a git directory
+===SORRY!===
+  No moar executable found in /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10 at /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu/3rdparty/nqp-configure/lib/NQP/Config.pm line 192.
+ at /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu/3rdparty/nqp-configure/lib/NQP/Config.pm line 34.
+        NQP::Config::__ANON__("===SORRY!===\x{a}  No moar executable found in /export/CHROOT/tmp"...) called at /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu/3rdparty/nqp-configure/lib/NQP/Config.pm line 192
+        NQP::Config::sorry(NQP::Config::NQP=HASH(0x78aaaa8469d8), "No moar executable found in /export/CHROOT/tmp/wip/rakudo-sta"...) called at /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu/tools/lib/NQP/Config/NQP.pm line 112
+        NQP::Config::NQP::configure_moar_backend(NQP::Config::NQP=HASH(0x78aaaa8469d8)) called at /export/CHROOT/tmp/wip/rakudo-star/work/rakudo-star-2020.10/tmp/mktemp.QKOoo7Wu/3rdparty/nqp-configure/lib/NQP/Config.pm line 660
+        NQP::Config::configure_active_backends(NQP::Config::NQP=HASH(0x78aaaa8469d8)) called at Configure.pl line 93
+[2020-12-30T12:54:58] [ALERT] Build failed!
+*** Error code 1
 :
diff --git a/rakudo-star/distinfo b/rakudo-star/distinfo
index d1668c9bd9..f70f40d9a3 100644
--- a/rakudo-star/distinfo
+++ b/rakudo-star/distinfo
@@ -4,4 +4,4 @@ SHA1 (rakudo-star-2020.10.tar.gz) = e9caa085894e32581dd2d9fb09ab9e253b758e33
 RMD160 (rakudo-star-2020.10.tar.gz) = 3e85ef6bd2e997126807e32ebc4e68120b360afe
 SHA512 (rakudo-star-2020.10.tar.gz) = f8c7ab9e67018db0422f30232180122f25c20f113dd54e85af67e080e9320bb1499930de65464aa299043204503838085322b26cb705246fd4ee8dd9f52c4f42
 Size (rakudo-star-2020.10.tar.gz) = 17377748 bytes
-SHA1 (patch-lib_actions_install.bash) = 7bfc52f46e9b0d755a4edb0ad6f08e398394078f
+SHA1 (patch-lib_actions_install.bash) = 31a658f4d55f226c5f2e9b47623a05cd016b7b67
diff --git a/rakudo-star/patches/patch-lib_actions_install.bash b/rakudo-star/patches/patch-lib_actions_install.bash
index b15f74b2e8..8c697704b7 100644
--- a/rakudo-star/patches/patch-lib_actions_install.bash
+++ b/rakudo-star/patches/patch-lib_actions_install.bash
@@ -3,15 +3,24 @@ $NetBSD$
 One part wants bmake, the other wants gmake
 
 --- ./lib/actions/install.bash.orig	2020-10-26 00:18:32.000000000 +0900
-+++ ./lib/actions/install.bash	2020-12-27 14:24:37.872924232 +0900
++++ ./lib/actions/install.bash	2020-12-27 15:10:57.489393386 +0900
+@@ -155,7 +155,7 @@ build_moarvm() {
+ 	perl Configure.pl \
+ 		"$@" \
+ 		&& make \
+-		&& make install \
++		&& env DESTDIR=@DESTDIR@ make install \
+ 		|| return
+ }
+ 
 @@ -166,8 +166,8 @@ build_nqp() {
  	perl Configure.pl \
  		--backend="$RSTAR_BACKEND" \
  		"$@" \
 -		&& make \
 -		&& make install \
-+		&& @@GMAKE@@ \
-+		&& @@GMAKE@@ install \
++		&& env PATH=@PREFIX@/bin gmake \
++		&& env DESTDIR=@DESTDIR@ PATH=@PREFIX@/bin gmake install \
  		|| return
  }
  
@@ -21,8 +30,8 @@ One part wants bmake, the other wants gmake
  		"$@" \
 -		&& make \
 -		&& make install \
-+		&& @@GMAKE@@ \
-+		&& @@GMAKE@@ install \
++		&& /usr/pkg/bin/gmake \
++		&& env DESTDIR=@DESTDIR@ /usr/pkg/bin/gmake install \
  		|| return
  }