summaryrefslogtreecommitdiffstats
path: root/preps
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2012-06-06 18:59:42 +0200
committerJustin Davis <jrcd83@gmail.com>2012-06-06 18:59:42 +0200
commit91922d68b35cc4e85b24935290d49a48dc9c638d (patch)
treea5fba08119796961dbcf83ac1accb8582dfdf24d /preps
parentc50e2c8a7f6350fffb9e59ee8d20539e52da923d (diff)
downloadgenpkg-91922d68b35cc4e85b24935290d49a48dc9c638d.tar.gz
genpkg-91922d68b35cc4e85b24935290d49a48dc9c638d.tar.xz
Module::Build dists were totally borked.
Diffstat (limited to 'preps')
-rwxr-xr-xpreps/perl.d/perl-dist5
-rwxr-xr-xpreps/perl.d/perl-pkgbuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/preps/perl.d/perl-dist b/preps/perl.d/perl-dist
index fd5c216..4431f77 100755
--- a/preps/perl.d/perl-dist
+++ b/preps/perl.d/perl-dist
@@ -371,6 +371,8 @@ sub printdata
sub writepb
{
my($ddir) = @_;
+
+ print STDERR "DBG: \$ddir = {$ddir}\n";
my $dtype = (-f "$ddir/Build.PL" ? "MB" : "MM");
if(system $PBPROG => $dtype){
return $? >> 8;
@@ -408,8 +410,7 @@ sub main
);
chdir $dir or die "chdir: $!";
-
- my $ret = writepb($dir);
+ my $ret = writepb("$dir/src/$distdir");
if($ret){
print STDERR "$PROG: failed to write PKGBUILD: error $ret\n";
return 1;
diff --git a/preps/perl.d/perl-pkgbuild b/preps/perl.d/perl-pkgbuild
index f1e9663..47a39ea 100755
--- a/preps/perl.d/perl-pkgbuild
+++ b/preps/perl.d/perl-pkgbuild
@@ -65,7 +65,8 @@ sub main
$script = 'Build.PL';
$make = './Build';
$iargs = q{installdirs=vendor destdir="$pkgdir"};
- push @badenv, 'PERL_MB_OPT', 'MODULEBUILDRC=/dev/null';
+ push @exports, 'MODULEBUILDRC=/dev/null';
+ push @badenv, 'PERL_MB_OPT';
}
my %funcs;
@@ -74,7 +75,7 @@ sub main
$funcs{$f}{'beg'} = startfunc($f);
# Module::Build uses env vars for each stage of Build
if($type eq 'MB'){
- $funcs{$f}{'beg'} = <<"ENDTXT";
+ $funcs{$f}{'beg'} .= functxt(<<"ENDTXT");
export @exports
unset @badenv
ENDTXT