diff --git a/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch b/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch deleted file mode 100644 index 3bd5046a4e8..00000000000 --- a/srcpkgs/rakudo/patches/fix-perl6-home-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git src/main.nqp src/main.nqp -index b53302759..bd9aeb5d5 100644 ---- src/main.nqp -+++ src/main.nqp -@@ -33,7 +33,7 @@ my $install-dir := $execname eq '' - - my $perl6-home := $comp.config - // nqp::getenvhash() -- // $install-dir ~ '/share/perl6'; -+ // $comp.config ~ '/perl6'; - if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep { - $perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1); - } -diff --git tools/lib/NQP/Config/Rakudo.pm tools/lib/NQP/Config/Rakudo.pm -index 90839c229..2819b60b6 100644 ---- tools/lib/NQP/Config/Rakudo.pm -+++ tools/lib/NQP/Config/Rakudo.pm -@@ -347,7 +347,7 @@ sub configure_moar_backend { - ); - $config->{static_perl6_home} = - File::Spec->rel2abs( -- File::Spec->catdir( $config->{prefix}, 'share', 'perl6' ) ); -+ File::Spec->catdir( $config->{libdir}, 'perl6' ) ); - $config->{static_nqp_home_define} = - '-DSTATIC_NQP_HOME=' - . $self->c_escape_string( $config->{static_nqp_home} ); diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template index ff5d757cd71..42c054a3341 100644 --- a/srcpkgs/rakudo/template +++ b/srcpkgs/rakudo/template @@ -1,12 +1,12 @@ # Template file for 'rakudo' pkgname=rakudo -version=2019.07.1 -revision=2 +version=2019.11 +revision=1 build_style=configure make_check_target=test make_install_args="RAKUDO_LOG_PRECOMP=1 RAKUDO_RERESOLVE_DEPENDENCIES=0" configure_script="perl Configure.pl" -configure_args="--prefix=/usr --libdir=/usr/lib --backends=moar" +configure_args="--prefix=/usr --perl6-home=/usr/lib/perl6 --backends=moar" make_dirs=" /usr/lib/perl6/bin 0755 root root /usr/lib/perl6/core/bin 0755 root root @@ -26,15 +26,15 @@ make_dirs=" /usr/lib/perl6/vendor/short 0755 root root /usr/lib/perl6/vendor/sources 0755 root root" hostmakedepends="perl" -makedepends="libatomic_ops-devel libffi-devel libtommath-devel libuv-devel nqp" +makedepends="libatomic_ops-devel libffi-devel libuv-devel libzstd-devel nqp" depends="nqp>=${version}_1" short_desc="Production-ready, stable implementation of the Perl 6 language" -maintainer="Ruslan " +maintainer="Andy Weidenbaum " license="Artistic-2.0" homepage="https://rakudo.org" changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog" distfiles="https://github.com/rakudo/rakudo/releases/download/${version}/${pkgname}-${version}.tar.gz" -checksum=d91dce95ec3f6fca1723c7eacfcbcc823269ba73dc945d778f608f0c878444f7 +checksum=36e19160d7a8b5dd723e5602d851ccef9e4cf0970e1c67589bf88935ceb65531 nocross=yes provides="perl6-${version}_${revision}"