You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by ge...@apache.org on 2007/06/29 17:20:39 UTC
svn commit: r551925 - in /perl/Apache-Test/trunk: Changes
lib/Apache/TestConfigC.pm
Author: geoff
Date: Fri Jun 29 08:20:38 2007
New Revision: 551925
URL: http://svn.apache.org/viewvc?view=rev&rev=551925
Log:
Add EXTRA_CFLAGS to c-module building if defined in the environment
Modified:
perl/Apache-Test/trunk/Changes
perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?view=diff&rev=551925&r1=551924&r2=551925
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Fri Jun 29 08:20:38 2007
@@ -13,6 +13,9 @@
PR: 25548
[imacat <im...@mail.imacat.idv.tw>]
+Add EXTRA_CFLAGS to c-module building if defined in the environment
+[Geoffrey Young]
+
=item 1.29 November 28, 2006
Require a minium of Module::Build 0.18 when using Apache::TestMB.
Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm?view=diff&rev=551925&r1=551924&r2=551925
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigC.pm Fri Jun 29 08:20:38 2007
@@ -169,6 +169,9 @@
my $dversion = $self->server->dversion;
my $name = $mod->{name};
my $makefile = catfile $mod->{dir}, 'Makefile';
+
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
debug "writing $makefile";
my $lib = $self->cmodules_build_so($name);
@@ -181,7 +184,7 @@
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} -c $name.c
clean:
-rm -rf $name.o $name.lo $name.slo $name.la .libs
@@ -213,6 +216,9 @@
close $fh;
}
}
+
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
debug "writing $makefile";
my $lib = $self->cmodules_build_so($name);
@@ -226,7 +232,7 @@
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} \$(APXSFLAGS) -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} \$(APXSFLAGS) -c $name.c
clean:
-rm -rf $name.o $name.lo $name.slo $name.la .libs
@@ -251,12 +257,16 @@
my $fh = Symbol::gensym();
open $fh, ">$makefile" or die "open $makefile: $!";
+ my $extra = $ENV{EXTRA_CFLAGS} || '';
+
+ debug "writing $makefile";
+
print $fh <<EOF;
APXS=$self->{APXS}
all: $lib
$lib: $name.c
- \$(APXS) $dversion -I$self->{cmodules_dir} $extras -c $name.c
+ \$(APXS) $dversion $extra -I$self->{cmodules_dir} $extras -c $name.c
clean:
-erase $goners