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

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 @@