diff options
| author | Jacob Pipkin <j@dawnrazor.net> | 2012-11-04 08:48:49 -0600 |
|---|---|---|
| committer | Jacob Pipkin <j@dawnrazor.net> | 2012-11-04 08:48:49 -0600 |
| commit | 35db9c2aaea8d7f7b211bc12609840ea2ef5ac64 (patch) | |
| tree | 93a4bd849ffa18ea3826946660698b3db8fd2ecb /SBO-Lib/lib/SBO/Lib.pm | |
| parent | 023d35c0c112c59cae7b32292c66343ea64311d9 (diff) | |
| download | sbotools2-35db9c2aaea8d7f7b211bc12609840ea2ef5ac64.tar.xz | |
use MAKEOPTS for -j instead of hacking the SlackBuild
Diffstat (limited to 'SBO-Lib/lib/SBO/Lib.pm')
| -rw-r--r-- | SBO-Lib/lib/SBO/Lib.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm index 4ad01e5..2eb996d 100644 --- a/SBO-Lib/lib/SBO/Lib.pm +++ b/SBO-Lib/lib/SBO/Lib.pm @@ -599,8 +599,6 @@ sub perform_sbo (%) { # set any changes we need to make to the .SlackBuild, setup the command $args{JOBS} = 0 if $args{JOBS} eq 'FALSE'; - $changes{make} = "-j $args{JOBS}" if $args{JOBS}; - if ($args{ARCH} eq 'x86_64' and ($args{C32} || $args{X32})) { if ($args{C32}) { @@ -610,8 +608,9 @@ sub perform_sbo (%) { } $cmd = '. /etc/profile.d/32dev.sh &&'; } - $cmd .= "/bin/sh $location/$sbo.SlackBuild"; - $cmd = "$args{OPTS} $cmd" if $args{OPTS}; + $cmd .= " $args{OPTS}" if $args{OPTS}; + $cmd .= " MAKEOPTS=\"-j$args{JOBS}\"" if $args{JOBS}; + $cmd .= " /bin/sh $location/$sbo.SlackBuild"; my $tempfh = tempfile (DIR => $tempdir); my $fn = get_tmp_extfn $tempfh; rewrite_slackbuild ( |