From 91cc157510e2f2ed651684c25b4c51f0ca64342b Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 7 Oct 2015 19:12:41 +0300 Subject: Perltidy --- dh_illumos_make | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dh_illumos_make b/dh_illumos_make index a1a18b9..b42b01a 100755 --- a/dh_illumos_make +++ b/dh_illumos_make @@ -89,19 +89,21 @@ proto area is F. =cut -$dh{'MAKE'} = '/usr/bin/make --sun'; -$dh{'TARGET'} = 'install'; -$dh{'CTF'} = 0; +$dh{'MAKE'} = '/usr/bin/make --sun'; +$dh{'TARGET'} = 'install'; +$dh{'CTF'} = 0; $dh{'NO_ONBLD'} = 0; -init(options => { - 'make|m=s' => \$dh{'MAKE'}, - 'target|t=s' => \$dh{'TARGET'}, - 'debug' => \$dh{'DEBUG'}, - 'ctf!' => \$dh{'CTF'}, - 'no-onbld' => \$dh{'NO_ONBLD'}, - 'native' => \$dh{'NATIVE'}, -}); +init( + options => { + 'make|m=s' => \$dh{'MAKE'}, + 'target|t=s' => \$dh{'TARGET'}, + 'debug' => \$dh{'DEBUG'}, + 'ctf!' => \$dh{'CTF'}, + 'no-onbld' => \$dh{'NO_ONBLD'}, + 'native' => \$dh{'NATIVE'}, + } +); my @dirs = ('usr/src'); if (@ARGV) { @@ -111,7 +113,7 @@ if (@ARGV) { # Check whether all dirs exist before doing anything: foreach (@dirs) { s,.*illumos-gate/+,,; - if (! -d "$_") { + if ( !-d "$_" ) { error("`$_' does not exist or not a directory"); } } @@ -119,8 +121,10 @@ foreach (@dirs) { # Build in each dir: # Sanity checks: foreach (qw/bldenv.sh env.sh/) { - if (! -r "usr/$_") { - error("`$_' not found under 'usr/'. Maybe illumos sources were not properly unpacked.") + if ( !-r "usr/$_" ) { + error( +"`$_' not found under 'usr/'. Maybe illumos sources were not properly unpacked." + ); } } @@ -131,19 +135,22 @@ $opts .= $onbld; my $override = ''; $override .= ' CTFCONVERT=:' if not $dh{'CTF'}; -$override .= ' CTFMERGE=:' if not $dh{'CTF'}; +$override .= ' CTFMERGE=:' if not $dh{'CTF'}; -if ($dh{'NATIVE'}) { +if ( $dh{'NATIVE'} ) { my $deb_host_arch_cpu = `dpkg-architecture -qDEB_HOST_ARCH_CPU`; chomp $deb_host_arch_cpu; $override .= ' i386_XARCH='; + # We need to propogate it through perl and shell to make: $override .= " LDLIBS32='\\\$(LDLIBS_NATIVE)'"; $override .= " MAPFILE.NGB='\\\$(MAPFILE.NGB_$deb_host_arch_cpu)'"; } foreach (@dirs) { - complex_doit(qq!ksh93 usr/bldenv.sh $opts usr/env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}$override"!); + complex_doit( +qq!ksh93 usr/bldenv.sh $opts usr/env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}$override"! + ); } =head1 SEE ALSO -- cgit v1.2.3