[jbossnative-commits] JBoss Native SVN: r3081 - trunk/build/patch.
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