Author: stsp
Date: Wed Jan 10 15:24:34 2018
New Revision: 1820757
URL: http://svn.apache.org/viewvc?rev=1820757&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Fix the httpd build if APR is compiled
without thread support.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1820757&r1=1820756&r2=1820757&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Jan 10 15:24:34 2018
@@ -683,6 +683,13 @@ $(HTTPD_OBJDIR)/acinclude.diff:
echo >>[email protected] ' AC_CHECK_FUNCS(SSL_set_state)'
mv -f [email protected] $@
+# fix build without APR_HAS_THREADS (broken by r1750836)
+ifneq ($(THREADING),yes)
+HTTPD_REVERT_1750836_CMD = (cd $(HTTPD_SRCDIR)/modules/proxy && svn diff
-c-1750836
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
| patch)
+else
+HTTPD_REVERT_1750836_CMD = true
+endif
+
# retrieve httpd
$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \
$(HTTPD_OBJDIR)/chil-engine.diff $(HTTPD_OBJDIR)/ssl-set-state.diff \
@@ -711,6 +718,7 @@ $(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$
< $(HTTPD_SRCDIR)/modules/ssl/${f}.orig \
> $(HTTPD_SRCDIR)/modules/ssl/${f};\
)
+ $(HTTPD_REVERT_1750836_CMD)
touch $@
# configure httpd
