subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1585911 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Wed, 09 Apr 2014 08:57:06 GMT
Author: stsp
Date: Wed Apr  9 08:57:06 2014
New Revision: 1585911

URL: http://svn.apache.org/r1585911
Log:
* tools/dev/unix-build/Makefile.svn: Update my custom build script,
   and hence the bb-openbsd buildbot, to APR 1.5.0 and APR-util 1.5.3.

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=1585911&r1=1585910&r2=1585911&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Apr  9 08:57:06 2014
@@ -68,10 +68,10 @@ OBJDIR		= $(PWD)/objdir
 
 BDB_MAJOR_VER	= 4.7
 BDB_VER		= $(BDB_MAJOR_VER).25
-APR_VER		= 1.4.8
+APR_VER		= 1.5.0
 APR_ICONV_VER	= 1.2.1
 GNU_ICONV_VER	= 1.14
-APR_UTIL_VER	= 1.4.1
+APR_UTIL_VER	= 1.5.3
 HTTPD_VER	= 2.2.26
 NEON_VER	= 0.29.6
 SERF_VER	= 1.3.4
@@ -85,6 +85,7 @@ 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
@@ -118,6 +119,7 @@ FETCH_CMD	= wget -c
 SUBVERSION_REPOS_URL = https://svn.apache.org/repos/asf/subversion
 BDB_URL		= http://ftp2.de.freebsd.org/pub/FreeBSD/distfiles/bdb/$(BDB_DIST)
 APR_URL		= http://svn.apache.org/repos/asf/apr/apr
+APR_PATCHES_URL	= http://www.apache.org/dist/apr/patches
 APR_ICONV_URL	= http://www.apache.org/dist/apr/$(APR_ICONV_DIST)
 GNU_ICONV_URL	= http://ftp.gnu.org/pub/gnu/libiconv/$(GNU_ICONV_DIST)
 APR_UTIL_URL	= http://svn.apache.org/repos/asf/apr/apr-util
@@ -309,6 +311,9 @@ $(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)



Mime
View raw message