Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39A3410886 for ; Sun, 27 Apr 2014 18:27:15 +0000 (UTC) Received: (qmail 53523 invoked by uid 500); 27 Apr 2014 18:27:14 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 53458 invoked by uid 500); 27 Apr 2014 18:27:14 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 53451 invoked by uid 99); 27 Apr 2014 18:27:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Apr 2014 18:27:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Apr 2014 18:27:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 375C423888D7; Sun, 27 Apr 2014 18:26:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1590445 - /subversion/trunk/tools/dev/unix-build/Makefile.svn Date: Sun, 27 Apr 2014 18:26:53 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140427182653.375C423888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Sun Apr 27 18:26:52 2014 New Revision: 1590445 URL: http://svn.apache.org/r1590445 Log: * tools/dev/unix-build/Makefile.svn: In my custom build script which is also used by the bb-openbsd buildbot, fix the build with libReSSL. 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=1590445&r1=1590444&r2=1590445&view=diff ============================================================================== --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Apr 27 18:26:52 2014 @@ -581,9 +581,27 @@ $(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$ 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' + echo >>$@.tmp '+++ modules/ssl/ssl_engine_init.c Mon Apr 14 13:21:22 2014' + echo >>$@.tmp '@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)' + echo >>$@.tmp ' ssl_die();' + echo >>$@.tmp ' }' + echo >>$@.tmp ' ' + echo >>$@.tmp '+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK' + echo >>$@.tmp ' if (strEQ(mc->szCryptoDevice, "chil")) {' + echo >>$@.tmp ' ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);' + echo >>$@.tmp ' }' + echo >>$@.tmp '+#endif' + echo >>$@.tmp ' ' + echo >>$@.tmp ' if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {' + echo >>$@.tmp ' ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,' + mv -f $@.tmp $@ + # configure httpd $(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJDIR)/.retrieved \ - $(APR_UTIL_OBJDIR)/.installed + $(APR_UTIL_OBJDIR)/.installed $(HTTPD_OBJDIR)/chil-engine.diff cd $(HTTPD_OBJDIR) \ && env CFLAGS="-g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ GREP="`which grep`" \ @@ -595,6 +613,7 @@ $(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