[jbossnative-commits] JBoss Native SVN: r2989 - trunk/build/patch.

Author: jfrederic.clere(a)jboss.com Date: 2013-01-11 11:59:32 -0500 (Fri, 11 Jan 2013) New Revision: 2989 Added: trunk/build/patch/apr-1.4.6.patch Modified: trunk/build/patch/openssl-1.0.1c.patch Log: Arrange patches. Added: trunk/build/patch/apr-1.4.6.patch =================================================================== --- trunk/build/patch/apr-1.4.6.patch (rev 0) +++ trunk/build/patch/apr-1.4.6.patch 2013-01-11 16:59:32 UTC (rev 2989) @@ -0,0 +1,20 @@ +--- include/apr.hw ++++ include/apr.hw +@@ -276,7 +276,7 @@ + #define APR_HAVE_IN_ADDR 1 + #define APR_HAVE_INET_ADDR 1 + #define APR_HAVE_INET_NETWORK 0 +-#define APR_HAVE_IPV6 0 ++#define APR_HAVE_IPV6 1 + #define APR_HAVE_MEMMOVE 1 + #define APR_HAVE_SETRLIMIT 0 + #define APR_HAVE_SIGACTION 0 +@@ -340,7 +340,7 @@ + /* If we have a TCP implementation that can be "corked", what flag + * do we use? + */ +-#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@ ++#define APR_TCP_NOPUSH_FLAG 0 + + /* Is the TCP_NODELAY socket option inherited from listening sockets? + */ Modified: trunk/build/patch/openssl-1.0.1c.patch =================================================================== --- trunk/build/patch/openssl-1.0.1c.patch 2013-01-11 14:28:54 UTC (rev 2988) +++ trunk/build/patch/openssl-1.0.1c.patch 2013-01-11 16:59:32 UTC (rev 2989) @@ -1,10 +1,28 @@ ---- ./util/pl/VC-32.pl 2013-01-11 15:23:27.442257591 +0100 -+++ ./util/pl/VC-32.pl 2013-01-11 15:26:28.695290367 +0100 -@@ -178,6 +178,7 @@ +--- util/pl/VC-32.pl ++++ util/pl/VC-32.pl +@@ -43,7 +43,7 @@ + # considered safe to ignore. + # + $base_cflags= " $mf_cflag"; +- my $f = $shlib || $fips ?' /MD':' /MT'; ++ my $f = ' /MD'; + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $opt_cflags=$f.' /Ox'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; +@@ -124,7 +124,7 @@ + else # Win32 + { + $base_cflags= " $mf_cflag"; +- my $f = $shlib || $fips ?' /MD':' /MT'; ++ my $f = ' /MD'; + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $opt_cflags=$f.' /Ox /O2 /Ob2'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; +@@ -175,6 +175,7 @@ + { + $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib'; + $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./); ++ $ex_libs.=' $(EXTRA_LIBS)'; # WIN32 UNICODE build gets linked with unicows.lib for # backward compatibility with Win9x. $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/); -+ $ex_libs.=' $(EXTRA_LIBS)' - } - - # static library stuff