subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1590458 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Sun, 27 Apr 2014 18:57:16 GMT
Author: stsp
Date: Sun Apr 27 18:57:15 2014
New Revision: 1590458

URL: http://svn.apache.org/r1590458
Log:
Follow-up to r1590445:

* tools/dev/unix-build/Makefile.svn: In my custom build script which is also
   used by the bb-openbsd buildbot, really fix the build with libReSSL.
   Apply SSL-related patches during unpack stage instead of configure stage.
   Disable use of RAND_egd() which libReSSL doesn't 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=1590458&r1=1590457&r2=1590458&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Apr 27 18:57:15 2014
@@ -72,7 +72,7 @@ APR_VER		= 1.5.0
 APR_ICONV_VER	= 1.2.1
 GNU_ICONV_VER	= 1.14
 APR_UTIL_VER	= 1.5.3
-HTTPD_VER	= 2.2.26
+HTTPD_VER	= 2.2.27
 NEON_VER	= 0.29.6
 SERF_VER	= 1.3.4
 SERF_OLD_VER	= 0.3.1
@@ -575,12 +575,6 @@ httpd-clean:
 $(DISTDIR)/$(HTTPD_DIST):
 	cd $(DISTDIR) && $(FETCH_CMD) $(HTTPD_URL)
 
-# retrieve httpd
-$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST)
-	[ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR)
-	tar -C $(SRCDIR) -jxf $(DISTDIR)/$(HTTPD_DIST)
-	touch $@
-
 $(HTTPD_OBJDIR)/chil-engine.diff:
 	mkdir -p $(dir $@)
 	echo > $@.tmp '--- modules/ssl/ssl_engine_init.c.orig	Mon Apr 14 13:20:57 2014'
@@ -599,9 +593,23 @@ $(HTTPD_OBJDIR)/chil-engine.diff:
 	echo >>$@.tmp '             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,'
 	mv -f $@.tmp $@
 
+
+# retrieve httpd
+$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \
+	$(HTTPD_OBJDIR)/chil-engine.diff
+	[ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR)
+	tar -C $(SRCDIR) -jxf $(DISTDIR)/$(HTTPD_DIST)
+	cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/chil-engine.diff
+	cp $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h \
+		$(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig
+	sed '/^#define HAVE_SSL_RAND_EGD/d' \
+		< $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig \
+		> $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h
+	touch $@
+
 # configure httpd
 $(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJDIR)/.retrieved \
-	$(APR_UTIL_OBJDIR)/.installed $(HTTPD_OBJDIR)/chil-engine.diff
+	$(APR_UTIL_OBJDIR)/.installed
 	cd $(HTTPD_OBJDIR) \
 		&& env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
 		GREP="`which grep`" \
@@ -613,7 +621,6 @@ $(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJ
 		--with-mpm=prefork \
 		--with-apr="$(PREFIX)/apr" \
 		--with-apr-util="$(PREFIX)/apr"
-	cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/chil-engine.diff
 	touch $@
 
 # compile httpd



Mime
View raw message