diff options
Diffstat (limited to 'internal/rosa/perl.go')
| -rw-r--r-- | internal/rosa/perl.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/internal/rosa/perl.go b/internal/rosa/perl.go index 63b512dd..2598cdc1 100644 --- a/internal/rosa/perl.go +++ b/internal/rosa/perl.go @@ -29,8 +29,6 @@ echo 'print STDOUT "1..0 # Skip broken test\n";' > ext/Pod-Html/t/htmldir3.t rm -f /system/bin/ps # perl does not like toybox ps `, ConfigureName: "./Configure", - Host: `""`, - Build: `""`, Configure: [][2]string{ {"-des"}, {"Dprefix", "/system"}, @@ -40,7 +38,10 @@ rm -f /system/bin/ps # perl does not like toybox ps {"Doptimize", "'-O2 -fno-strict-aliasing'"}, {"Duseithreads"}, }, - CheckName: "TEST_JOBS=256 test_harness", + Check: []string{ + "TEST_JOBS=256", + "test_harness", + }, ScriptInstall: "./perl -Ilib -I. installperl --destdir=/work", Flag: TEarly, @@ -95,16 +96,18 @@ func (t Toolchain) newViaPerlMakeMaker( return t.NewViaMake("perl-"+name, version, t.NewPatchedSource( "perl-"+name, version, source, false, patches..., ), &MakeAttr{ - Writable: true, - OmitDefaults: true, - SkipConfigure: true, - InPlace: true, + Writable: true, + OmitDefaults: true, + InPlace: true, ScriptEarly: ` cd /usr/src/perl-` + name + ` -perl Makefile.PL PREFIX=/system `, - CheckName: "test", + ConfigureName: "perl Makefile.PL", + Configure: [][2]string{ + {"PREFIX", "/system"}, + }, + Check: []string{"test"}, }, slices.Concat(extra, []pkg.Artifact{ t.Load(Perl), })...) |