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 @@
Show replies by date