[patch] 0004: apxs: fix whitespace problems

0004-apxs-fix-whitespace-problems.patch (text/plain), 3.83 KB, created by Jacob Champion on 2016-01-28 00:05:44 UTC

(hide)

Description: 0004: apxs: fix whitespace problems

Filename:

MIME Type:

Creator: Jacob Champion

Created: 2016-01-28 00:05:44 UTC

Size: 3.83 KB

patch

obsolete

>From 5d847aa4c677ed47f142dd4eddde4095b9ce8361 Mon Sep 17 00:00:00 2001 >From: Jacob Champion <champion.p@gmail.com> >Date: Wed, 27 Jan 2016 15:26:16 -0800 >Subject: [PATCH 4/4] apxs: fix whitespace problems > >Mixed tabs and spaces were causing misalignment for people who don't use >eight-space tab stops. While I'm at it, remove trailing whitespace in >the Perl code as well. (The __DATA__ portion is untouched by this >change.) >--- > support/apxs.in | 53 ++++++++++++++++++++++++++--------------------------- > 1 file changed, 26 insertions(+), 27 deletions(-) > >diff --git a/support/apxs.in b/support/apxs.in >index 9c66395..56ecb72 100644 >--- a/support/apxs.in >+++ b/support/apxs.in >@@ -168,21 +168,21 @@ $name = $opt_n if ($opt_n ne ''); > if (@opt_S) { > my ($opt_S); > foreach $opt_S (@opt_S) { >- if ($opt_S =~ m/^([^=]+)=(.*)$/) { >- my ($var) = $1; >- my ($val) = $2; >- my $oldval = eval "\$CFG_$var"; >- >- unless ($var and $oldval) { >- print STDERR "apxs:Error: no config variable $var\n"; >- &usage; >- } >- >- eval "\$CFG_${var}=\"${val}\""; >- } else { >- print STDERR "apxs:Error: malformatted -S option\n"; >- &usage; >- } >+ if ($opt_S =~ m/^([^=]+)=(.*)$/) { >+ my ($var) = $1; >+ my ($val) = $2; >+ my $oldval = eval "\$CFG_$var"; >+ >+ unless ($var and $oldval) { >+ print STDERR "apxs:Error: no config variable $var\n"; >+ &usage; >+ } >+ >+ eval "\$CFG_${var}=\"${val}\""; >+ } else { >+ print STDERR "apxs:Error: malformatted -S option\n"; >+ &usage; >+ } > } > } > >@@ -302,27 +302,27 @@ if ($opt_g) { > > if ($opt_q) { > ## >- ## QUERY INFORMATION >+ ## QUERY INFORMATION > ## > my $result; >- if ($#args >= 0) { >+ if ($#args >= 0) { > $result = get_vars(@args); > print "$result\n"; > } else { > # -q without var name prints all variables and their values >- >+ > # Additional -v pretty-prints output > if ($opt_v) { > # Variable names in alphabetic order > my @vars = sort {uc($a) cmp uc($b)} keys %config_vars; >- >+ > # Make the left column as wide as the longest variable name > my $width = 0; > foreach (@vars) { >- my $l = length $_; >+ my $l = length $_; > $width = $l unless ($l <= $width); > } >- >+ > foreach (@vars) { > printf "%-${width}s = %s\n", $_, $config_vars{$_}; > } >@@ -434,7 +434,7 @@ if ($opt_c) { > > # create link command > my $o; >- my $lo; >+ my $lo; > foreach $o (@objs) { > $lo .= " $o"; > } >@@ -452,7 +452,6 @@ if ($opt_c) { > > my $ldflags = "$CFG_LDFLAGS"; > if ($opt_p == 1) { >- > my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`; > chomp($apr_libs); > my $apu_libs=""; >@@ -460,7 +459,7 @@ if ($opt_c) { > $apu_libs=`$apu_config --ldflags --link-libtool --libs`; > chomp($apu_libs); > } >- >+ > $opt .= " ".$apu_libs." ".$apr_libs; > } > else { >@@ -501,9 +500,9 @@ if ($opt_i or $opt_e) { > # use .so unambigiously for installed shared library modules > $t =~ s|\.[^./\\]+$|\.so|; > if ($opt_i) { >- push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" . >+ push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" . > "$libtool' $f $CFG_LIBEXECDIR"); >- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); >+ push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); > } > > # determine module symbolname (if we're activating it) >@@ -645,7 +644,7 @@ if ($opt_i or $opt_e) { > } else { > notice("unable to open configuration file"); > } >- } >+ } > } > } > >-- >1.9.1 > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]