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 AD4A811E28 for ; Wed, 6 Aug 2014 11:38:47 +0000 (UTC) Received: (qmail 20786 invoked by uid 500); 6 Aug 2014 11:38:47 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 20757 invoked by uid 500); 6 Aug 2014 11:38:47 -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 20747 invoked by uid 99); 6 Aug 2014 11:38:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2014 11:38:47 +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; Wed, 06 Aug 2014 11:38:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 081DF2389247; Wed, 6 Aug 2014 11:36:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1616170 - /subversion/trunk/tools/dev/unix-build/Makefile.svn Date: Wed, 06 Aug 2014 11:36:10 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140806113611.081DF2389247@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Wed Aug 6 11:36:10 2014 New Revision: 1616170 URL: http://svn.apache.org/r1616170 Log: * tools/dev/unix-build/Makefile.svn: Update to APR 1.5.1. 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=1616170&r1=1616169&r2=1616170&view=diff ============================================================================== --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Aug 6 11:36:10 2014 @@ -68,7 +68,7 @@ OBJDIR = $(PWD)/objdir BDB_MAJOR_VER = 4.7 BDB_VER = $(BDB_MAJOR_VER).25 -APR_VER = 1.5.0 +APR_VER = 1.5.1 APR_ICONV_VER = 1.2.1 GNU_ICONV_VER = 1.14 APR_UTIL_VER = 1.5.3 @@ -85,7 +85,6 @@ PYTHON_VER = 2.7.3 JUNIT_VER = 4.10 GETTEXT_VER = 0.18.3.1 -APR_1_5_PATCH = apr-1.5.0-out-of-tree-build.patch BDB_DIST = db-$(BDB_VER).tar.gz APR_ICONV_DIST = apr-iconv-$(APR_ICONV_VER).tar.gz GNU_ICONV_DIST = libiconv-$(GNU_ICONV_VER).tar.gz @@ -145,7 +144,6 @@ FETCH_CMD = wget -c SUBVERSION_REPOS_URL = https://svn.apache.org/repos/asf/subversion BDB_URL = http://download.oracle.com/berkeley-db/$(BDB_DIST) APR_URL = https://svn.apache.org/repos/asf/apr/apr -APR_PATCHES_URL = https://www.apache.org/dist/apr/patches APR_ICONV_URL = https://www.apache.org/dist/apr/$(APR_ICONV_DIST) GNU_ICONV_URL = https://ftp.gnu.org/pub/gnu/libiconv/$(GNU_ICONV_DIST) APR_UTIL_URL = https://svn.apache.org/repos/asf/apr/apr-util @@ -340,9 +338,6 @@ $(APR_OBJDIR)/.retrieved: if [ ! -d $(APR_SRCDIR) ]; then \ svn export $(APR_URL)/tags/$(APR_VER)/ $(APR_SRCDIR); \ fi - -(cd $(APR_SRCDIR) && \ - $(FETCH_CMD) $(APR_PATCHES_URL)/$(APR_1_5_PATCH) && \ - patch -N -p1 < $(APR_1_5_PATCH)) touch $@ ifeq ($(THREADING),yes)