JBoss Native SVN: r3084 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 11:19:45 -0400 (Thu, 06 Jun 2013)
New Revision: 3084
Modified:
trunk/build/patch/openssl-0.9.8i.patch
Log:
rollback r3082.
Modified: trunk/build/patch/openssl-0.9.8i.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 15:16:20 UTC (rev 3083)
+++ trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 15:19:45 UTC (rev 3084)
@@ -1,28 +1,20 @@
--- 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';
+@@ -31,7 +31,7 @@
+ $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
++ my $f = $shlib?' /MD':' /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';
+@@ -96,7 +96,7 @@
+ $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
++ my $f = $shlib?' /MD':' /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/);
12 years, 3 months
JBoss Native SVN: r3083 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 11:16:20 -0400 (Thu, 06 Jun 2013)
New Revision: 3083
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
Use: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/native/srcl...
need to rollback r3082 (wrong version).
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 14:18:19 UTC (rev 3082)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 15:16:20 UTC (rev 3083)
@@ -1,20 +1,28 @@
---- util/pl/VC-32.pl 2013-06-04 07:50:54.201533400 -0400
-+++ util/pl/VC-32.pl 2013-06-04 07:52:50.994670900 -0400
-@@ -49,7 +49,7 @@
- $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+--- 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 = $shlib || $fips ?' /MD':' /MD';
++ 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';
-@@ -114,7 +114,7 @@
- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+@@ -124,7 +124,7 @@
+ else # Win32
+ {
+ $base_cflags= " $mf_cflag";
- my $f = $shlib || $fips ?' /MD':' /MT';
-+ my $f = $shlib || $fips ?' /MD':' /MD';
++ 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/);
12 years, 3 months
JBoss Native SVN: r3082 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 10:18:19 -0400 (Thu, 06 Jun 2013)
New Revision: 3082
Modified:
trunk/build/patch/openssl-0.9.8i.patch
Log:
Use: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/native/srcl...
Modified: trunk/build/patch/openssl-0.9.8i.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 12:42:44 UTC (rev 3081)
+++ trunk/build/patch/openssl-0.9.8i.patch 2013-06-06 14:18:19 UTC (rev 3082)
@@ -1,20 +1,28 @@
--- util/pl/VC-32.pl
+++ util/pl/VC-32.pl
-@@ -31,7 +31,7 @@
- $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
-+ my $f = $shlib?' /MD':' /MD';
+@@ -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';
-@@ -96,7 +96,7 @@
- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
-+ my $f = $shlib?' /MD':' /MD';
+@@ -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/);
12 years, 3 months
JBoss Native SVN: r3081 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 08:42:44 -0400 (Thu, 06 Jun 2013)
New Revision: 3081
Modified:
trunk/build/patch/httpd-2.2.21.patch
Log:
Add back corrected patches.
Modified: trunk/build/patch/httpd-2.2.21.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.patch 2013-06-06 12:34:11 UTC (rev 3080)
+++ trunk/build/patch/httpd-2.2.21.patch 2013-06-06 12:42:44 UTC (rev 3081)
@@ -51,3 +51,84 @@
rv = errno;
}
}
+--- ./srclib/apr/buildconf 2010-03-05 13:38:36.000000000 +0100
++++ ./srclib/apr/buildconf 2013-06-06 14:24:21.833677315 +0200
+@@ -50,7 +50,7 @@
+ lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+ IFS=.; set $lt_version; IFS=' '
+ if test "$1" = "1"; then
+- $libtoolize --copy --automake --force $verbose
++ $libtoolize --copy --automake --force --install $verbose
+ if [ -f libtool.m4 ]; then
+ ltfile=`pwd`/libtool.m4
+ else
+@@ -72,7 +72,7 @@
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ fi
+ if test "$1" = "2"; then
+- $libtoolize --copy --force $verbose
++ $libtoolize --copy --force --install $verbose
+ fi
+
+ # Clean up any leftovers
+--- ./srclib/apr-util/xml/expat/configure.in 2013-06-05 19:03:46.000584753 +0200
++++ ./srclib/apr-util/xml/expat/configure.in 2013-06-06 14:21:30.167618342 +0200
+@@ -39,6 +39,12 @@
+ AC_CONFIG_HEADER(expat_config.h)
+
+ sinclude(conftools/ac_c_bigendian_cross.m4)
++sinclude(conftools/libtool.m4)
++sinclude(conftools/ltsugar.m4)
++sinclude(conftools/argz.m4)
++sinclude(conftools/ltoptions.m4)
++sinclude(conftools/ltversion.m4)
++sinclude(conftools/lt~obsolete.m4)
+
+ AC_CANONICAL_SYSTEM
+
+--- ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-05 19:03:58.464733329 +0200
++++ ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-06 14:16:20.001058561 +0200
+@@ -1,5 +1,10 @@
+ #! /bin/sh
+
++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
++ verbose="--verbose"
++ shift
++fi
++
+ #
+ # Find libtoolize. Prefer 1.x versions.
+ #
+@@ -27,7 +32,7 @@
+ (cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+ rm -rf autom4te*.cache aclocal.m4
+
+-$libtoolize --copy --automake
++$libtoolize --copy --automake --force $verbose
+
+ #
+ # find libtool.m4
+@@ -43,6 +48,9 @@
+ exit 1
+ fi
+ fi
++if [ ! -f conftools/libtool.m4 ]; then
++ mv aclocal.m4 conftools/libtool.m4
++fi
+
+ #
+ # Build aclocal.m4 from libtool's m4 files
+@@ -66,11 +74,11 @@
+ # Generate the autoconf header template (config.h.in) and ./configure
+ #
+ echo "Creating config.h.in ..."
+-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ echo "Creating configure ..."
+ ### do some work to toss config.cache?
+-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ # Remove autoconf caches
+ rm -rf autom4te*.cache aclocal.m4
12 years, 3 months
JBoss Native SVN: r3080 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 08:34:11 -0400 (Thu, 06 Jun 2013)
New Revision: 3080
Modified:
trunk/build/patch/httpd-2.2.21.patch
Log:
Remove patches that don't apply.
Modified: trunk/build/patch/httpd-2.2.21.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.patch 2013-06-05 17:00:53 UTC (rev 3079)
+++ trunk/build/patch/httpd-2.2.21.patch 2013-06-06 12:34:11 UTC (rev 3080)
@@ -32,93 +32,6 @@
!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
OBJECTS = $(OBJECTS) \
---- srclib/apr-util/xml/expat/buildconf.sh (original)
-+++ srclib/apr-util/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009
-@@ -1,5 +1,10 @@
- #! /bin/sh
-
-+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
-+ verbose="--verbose"
-+ shift
-+fi
-+
- #
- # Find libtoolize
- #
-@@ -25,7 +30,7 @@
- (cd conftools ; rm -f ltconfig ltmain.sh)
- rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
-
--$libtoolize --copy --automake
-+$libtoolize --copy --automake --force $verbose
-
- #
- # Build aclocal.m4 from libtool's libtool.m4
-@@ -42,12 +47,12 @@
- cat $ltfile >> aclocal.m4
-
- if [ -f ltsugar.m4 ]; then
-- echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
-- cat ltsugar.m4 >> aclocal.m4
-+ rm -f conftools/ltsugar.m4
-+ mv ltsugar.m4 conftools/ltsugar.m4
- fi
-
--# Clean up again
--rm -f libtool.m4 ltsugar.m4
-+# Clean up any leftovers
-+rm -f aclocal.m4 libtool.m4
-
- cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
-
-@@ -55,11 +60,11 @@
- # Generate the autoconf header template (config.h.in) and ./configure
- #
- echo "Creating config.h.in ..."
--${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
-+${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
-
- echo "Creating configure ..."
- ### do some work to toss config.cache?
--${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
-+${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
-
- # Remove autoconf caches
- rm -rf autom4te*.cache
-
---- srclib/apr-util/xml/expat/configure.in (original)
-+++ srclib/apr-util/xml/expat/configure.in Thu Nov 12 23:20:30 2009
-@@ -12,6 +12,14 @@
-
- AC_INIT(Makefile.in)
- AC_CONFIG_AUX_DIR(conftools)
-+AC_CONFIG_MACRO_DIR(conftools)
-+
-+sinclude(conftools/libtool.m4)
-+sinclude(conftools/ltsugar.m4)
-+sinclude(conftools/argz.m4)
-+sinclude(conftools/ltoptions.m4)
-+sinclude(conftools/ltversion.m4)
-+sinclude(conftools/lt~obsolete.m4)
-
- dnl
- dnl Follow the GNU/Linux convention of odd number minor version for
-
-
-
---- srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:23:25.616783000 -0400
-+++ srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:38:00.551126000 -0400
-@@ -50,6 +50,9 @@
- rm -f conftools/ltsugar.m4
- mv ltsugar.m4 conftools/ltsugar.m4
- fi
-+if [ ! -f conftools/libtool.m4 ]; then
-+ mv aclocal.m4 conftools/libtool.m4
-+fi
-
- # Clean up any leftovers
- rm -f aclocal.m4 libtool.m4
-
--- srclib/apr/network_io/unix/multicast.c 2012/04/04 11:17:32 1309331
+++ srclib/apr/network_io/unix/multicast.c 2012/04/04 11:20:43 1309332
@@ -217,6 +217,7 @@
12 years, 3 months
JBoss Native SVN: r3079 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-05 13:00:53 -0400 (Wed, 05 Jun 2013)
New Revision: 3079
Modified:
trunk/build/patch/httpd-2.2.21.patch
Log:
Remove the already fixed patch.
Modified: trunk/build/patch/httpd-2.2.21.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.patch 2013-06-04 18:13:33 UTC (rev 3078)
+++ trunk/build/patch/httpd-2.2.21.patch 2013-06-05 17:00:53 UTC (rev 3079)
@@ -15,19 +15,6 @@
fi
])
---- srclib/apr/file_io/win32/open.c (revision 920862)
-+++ srclib/apr/file_io/win32/open.c (working copy)
-@@ -610,8 +610,8 @@
- #endif
- #if APR_HAS_ANSI_FS
- ELSE_WIN_OS_IS_ANSI {
-- if (!CreateHardLinkA(wto_path, wfrom_path))
-- return apr_get_os_error()
-+ if (!CreateHardLinkA(to_path, from_path, NULL))
-+ return apr_get_os_error();
- }
- #endif
- return rv;
--- srclib/apr/NMAKEmakefile (revision 2617)
+++ srclib/apr/NMAKEmakefile (working copy)
@@ -106,11 +106,12 @@
12 years, 3 months
JBoss Native SVN: r3078 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-04 14:13:33 -0400 (Tue, 04 Jun 2013)
New Revision: 3078
Modified:
trunk/build/patch/httpd-2.2.21.patch
Log:
Remove the verbose part (patch fails on them).
Modified: trunk/build/patch/httpd-2.2.21.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.patch 2013-06-04 11:56:00 UTC (rev 3077)
+++ trunk/build/patch/httpd-2.2.21.patch 2013-06-04 18:13:33 UTC (rev 3078)
@@ -45,52 +45,6 @@
!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
OBJECTS = $(OBJECTS) \
---- srclib/apr-util/buildconf (original)
-+++ srclib/apr-util/buildconf Thu Nov 12 23:20:30 2009
-@@ -17,6 +17,11 @@
- #
- #
-
-+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
-+ verbose="--verbose"
-+ shift
-+fi
-+
- # Default place to look for apr source. Can be overridden with
- # --with-apr=[directory]
- apr_src_dir=../apr
-@@ -67,11 +72,11 @@
- # Generate the autoconf header (include/apu_config.h) and ./configure
- #
- echo "Creating include/private/apu_config.h ..."
--${AUTOHEADER:-autoheader}
-+${AUTOHEADER:-autoheader} $verbose
-
- echo "Creating configure ..."
- ### do some work to toss config.cache?
--if ${AUTOCONF:-autoconf}; then
-+if ${AUTOCONF:-autoconf} $verbose; then
- :
- else
- echo "autoconf failed"
-@@ -82,14 +87,14 @@
- # Generate build-outputs.mk for the build system
- #
- echo "Generating 'make' outputs ..."
--$apr_src_dir/build/gen-build.py make
-+$apr_src_dir/build/gen-build.py $verbose make
-
- #
- # If Expat has been bundled, then go and configure the thing
- #
- if [ -f xml/expat/buildconf.sh ]; then
- echo "Invoking xml/expat/buildconf.sh ..."
-- (cd xml/expat; ./buildconf.sh)
-+ (cd xml/expat; ./buildconf.sh $verbose)
- fi
-
- # Remove autoconf cache again
-
--- srclib/apr-util/xml/expat/buildconf.sh (original)
+++ srclib/apr-util/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009
@@ -1,5 +1,10 @@
12 years, 3 months
JBoss Native SVN: r3077 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-04 07:56:00 -0400 (Tue, 04 Jun 2013)
New Revision: 3077
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
That patch failed....
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-04 09:58:57 UTC (rev 3076)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-04 11:56:00 UTC (rev 3077)
@@ -1,20 +1,20 @@
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -31,7 +31,7 @@
+--- util/pl/VC-32.pl 2013-06-04 07:50:54.201533400 -0400
++++ util/pl/VC-32.pl 2013-06-04 07:52:50.994670900 -0400
+@@ -49,7 +49,7 @@
$base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
-+ my $f = $shlib?' /MD':' /MD';
+- my $f = $shlib || $fips ?' /MD':' /MT';
++ my $f = $shlib || $fips ?' /MD':' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -96,7 +96,7 @@
+@@ -114,7 +114,7 @@
$base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
-+ my $f = $shlib?' /MD':' /MD';
+- my $f = $shlib || $fips ?' /MD':' /MT';
++ my $f = $shlib || $fips ?' /MD':' /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';
12 years, 3 months
JBoss Native SVN: r3076 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-04 05:58:57 -0400 (Tue, 04 Jun 2013)
New Revision: 3076
Modified:
trunk/build/unix/build.sh
Log:
Default to tar
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-03 18:47:02 UTC (rev 3075)
+++ trunk/build/unix/build.sh 2013-06-04 09:58:57 UTC (rev 3076)
@@ -422,6 +422,9 @@
if [ "x" = "x${gnutar}" ];then
gnutar=`util/find_gnu.sh gtar`
fi
+if [ "x" = "x${gnutar}" ];then
+ gnutar=tar
+fi
export gnutar
12 years, 3 months
JBoss Native SVN: r3075 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-03 14:47:02 -0400 (Mon, 03 Jun 2013)
New Revision: 3075
Added:
trunk/build/patch/openssl-0.9.8r.patch
Log:
Add missing patch.
Added: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch (rev 0)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-03 18:47:02 UTC (rev 3075)
@@ -0,0 +1,20 @@
+--- util/pl/VC-32.pl
++++ util/pl/VC-32.pl
+@@ -31,7 +31,7 @@
+ $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
++ my $f = $shlib?' /MD':' /MD';
+ $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
+ $opt_cflags=$f.' /Ox';
+ $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+@@ -96,7 +96,7 @@
+ $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
++ my $f = $shlib?' /MD':' /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';
12 years, 3 months