perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1543395 - in /perl/apxs/trunk: apr_win32.pl apu_win32.pl apxs_win32 apxs_win32.pl
Date Tue, 19 Nov 2013 11:46:44 GMT
Author: stevehay
Date: Tue Nov 19 11:46:43 2013
New Revision: 1543395

URL: http://svn.apache.org/r1543395
Log:
Fix apxs to work with 64-bit httpd-2.4.x and recent perls.

Patch by Jeff Trawick

Subject: Re: apxs for Windows -- where is it in svn? it is part of apache, not mod_perl. no
idea if windows includes it
From: Jeff Trawick <trawick@gmail.com>
Date: Thu, 14 Nov 2013 18:38:35 -0500
Message-ID: <CAKUrXK6h2WDBLZe4Je6ZKdBEYJSLXMSzz-GO4XT3okq45sm_9g@mail.gmail.com>

(See http://permalink.gmane.org/gmane.comp.apache.mod-perl.devel/10380)

Modified:
    perl/apxs/trunk/apr_win32.pl
    perl/apxs/trunk/apu_win32.pl
    perl/apxs/trunk/apxs_win32
    perl/apxs/trunk/apxs_win32.pl

Modified: perl/apxs/trunk/apr_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apr_win32.pl?rev=1543395&r1=1543394&r2=1543395&view=diff
==============================================================================
--- perl/apxs/trunk/apr_win32.pl (original)
+++ perl/apxs/trunk/apr_win32.pl Tue Nov 19 11:46:43 2013
@@ -89,7 +89,7 @@ my %apr_args = (APR_MAJOR_VERSION => $ve
                 SHELL => $ENV{comspec},
                 CPPFLAGS => '',
                 CFLAGS => q{ /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG },
-                LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll /machine:I386
},
+                LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll },
 		LIBS => '',
                 EXTRA_INCLUDES => '',
                 APR_SOURCE_DIR => '',

Modified: perl/apxs/trunk/apu_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apu_win32.pl?rev=1543395&r1=1543394&r2=1543395&view=diff
==============================================================================
--- perl/apxs/trunk/apu_win32.pl (original)
+++ perl/apxs/trunk/apu_win32.pl Tue Nov 19 11:46:43 2013
@@ -90,7 +90,7 @@ my %apu_args = (APRUTIL_MAJOR_VERSION =>
                 SHELL => $ENV{comspec},
                 CPPFLAGS => '',
                 CFLAGS => q{ /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG },
-                LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll /machine:I386
},
+                LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll },
                 LIBS => '',
                 EXTRA_INCLUDES => '',
                 APRUTIL_SOURCE_DIR => '',

Modified: perl/apxs/trunk/apxs_win32
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apxs_win32?rev=1543395&r1=1543394&r2=1543395&view=diff
==============================================================================
--- perl/apxs/trunk/apxs_win32 (original)
+++ perl/apxs/trunk/apxs_win32 Tue Nov 19 11:46:43 2013
@@ -104,7 +104,6 @@ sub Getopts {
     my ($argumentative, @ARGV) = @_;
     my $errs = 0;
     local $_;
-    local $[ = 0;
 
     my @args = split / */, $argumentative;
     while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {

Modified: perl/apxs/trunk/apxs_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apxs_win32.pl?rev=1543395&r1=1543394&r2=1543395&view=diff
==============================================================================
--- perl/apxs/trunk/apxs_win32.pl (original)
+++ perl/apxs/trunk/apxs_win32.pl Tue Nov 19 11:46:43 2013
@@ -195,7 +195,7 @@ CPPFLAGS =
 CFLAGS = /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG
 CXXFLAGS =
 LTFLAGS =
-LDFLAGS = kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"%APACHE2%\lib"
+LDFLAGS = kernel32.lib /nologo /subsystem:windows /dll /libpath:"%APACHE2%\lib"
 LT_LDFLAGS = 
 SH_LDFLAGS =
 HTTPD_LDFLAGS =



Mime
View raw message