Author: stsp
Date: Mon Nov 21 11:06:24 2022
New Revision: 1905428
URL: http://svn.apache.org/viewvc?rev=1905428&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: remove old serf used for SVN 1.5; obsolete
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=1905428&r1=1905427&r2=1905428&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 11:06:24 2022
@@ -120,7 +120,6 @@ PCRE_VER = 8.41
HTTPD_VER = 2.4.37
NEON_VER = 0.30.2
SERF_VER = 1.3.9
-SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
@@ -216,7 +215,6 @@ HTTPD_URL = https://archive.apache.org/d
#NEON_URL = http://webdav.org/neon/$(NEON_DIST)
NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST)
SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
-SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER)
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL =
https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
@@ -240,7 +238,6 @@ PCRE_SRCDIR = $(SRCDIR)/pcre-$(PCRE_VER)
HTTPD_SRCDIR = $(SRCDIR)/httpd-$(HTTPD_VER)
NEON_SRCDIR = $(SRCDIR)/neon-$(NEON_VER)
SERF_SRCDIR = $(SRCDIR)/serf-$(SERF_VER)
-SERF_OLD_SRCDIR = $(SRCDIR)/serf-$(SERF_OLD_VER)
SQLITE_SRCDIR = $(SRCDIR)/sqlite-autoconf-$(SQLITE_VER)
CYRUS_SASL_SRCDIR = $(SRCDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_SRCDIR = $(SRCDIR)/file-$(LIBMAGIC_VER)
@@ -263,7 +260,6 @@ PCRE_OBJDIR = $(OBJDIR)/pcre-$(PCRE_VER)
HTTPD_OBJDIR = $(OBJDIR)/httpd-$(HTTPD_VER)
NEON_OBJDIR = $(OBJDIR)/neon-$(NEON_VER)
SERF_OBJDIR = $(OBJDIR)/serf-$(SERF_VER)
-SERF_OLD_OBJDIR = $(OBJDIR)/serf-$(SERF_OLD_VER)
SQLITE_OBJDIR = $(OBJDIR)/sqlite-$(SQLITE_VER)
CYRUS_SASL_OBJDIR = $(OBJDIR)/cyrus-sasl-$(CYRUS_SASL_VER)
LIBMAGIC_OBJDIR = $(OBJDIR)/file-$(LIBMAGIC_VER)
@@ -300,7 +296,7 @@ PKG_CONFIG_PATH=$(PREFIX)/apr/lib/pkgcon
.PHONY: all reset clean nuke fetch
all: dirs-create bdb-install apr-install iconv-install apr-util-install \
- pcre-install httpd-install neon-install serf-install serf-old-install \
+ pcre-install httpd-install neon-install serf-install \
sqlite-install cyrus-sasl-install libmagic-install \
ruby-install bz2-install python-install python2-install py3c-retrieve \
gettext-install lz4-install swig-old-install svn-install \
@@ -308,13 +304,13 @@ all: dirs-create bdb-install apr-install
# Use these to start a build from the beginning.
reset: dirs-reset bdb-reset apr-reset iconv-reset apr-util-reset \
- pcre-reset httpd-reset neon-reset serf-reset serf-old-reset \
+ pcre-reset httpd-reset neon-reset serf-reset \
sqlite-reset cyrus-sasl-reset libmagic-reset ruby-reset python-reset \
python2-reset bz2-reset gettext-reset lz4-reset swig-old-reset svn-reset
# Use to save disk space.
clean: bdb-clean apr-clean iconv-clean apr-util-clean pcre-clean httpd-clean \
- neon-clean serf-clean serf-old-clean sqlite-clean cyrus-sasl-clean \
+ neon-clean serf-clean sqlite-clean cyrus-sasl-clean \
libmagic-clean ruby-clean bz2-clean python-clean python2-clean \
gettext-clean lz4-clean swig-old-clean svn-clean
@@ -966,50 +962,6 @@ $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR
touch $@
#######################################################################
-# serf-old (compatible with Subversion 1.5)
-#######################################################################
-
-serf-old-retrieve: $(SERF_OLD_OBJDIR)/.retrieved
-serf-old-configure: $(SERF_OLD_OBJDIR)/.configured
-serf-old-compile: $(SERF_OLD_OBJDIR)/.compiled
-serf-old-install: $(SERF_OLD_OBJDIR)/.installed
-serf-old-reset:
- $(foreach f, .retrieved .configured .compiled .installed, \
- rm -f $(SERF_OLD_OBJDIR)/$(f);)
-
-serf-old-clean:
- -(cd $(SERF_OLD_SRCDIR) && ./serfmake clean)
-
-# retrieve serf if not present yet
-$(SERF_OLD_OBJDIR)/.retrieved:
- [ -d $(SERF_OLD_OBJDIR) ] || mkdir -p $(SERF_OLD_OBJDIR)
- if [ ! -d $(SERF_OLD_SRCDIR) ]; then \
- svn export $(SERF_OLD_URL) $(SERF_OLD_SRCDIR); \
- fi
- touch $@
-
-# compile serf (serf won't compile outside its source tree)
-$(SERF_OLD_OBJDIR)/.compiled: $(SERF_OLD_OBJDIR)/.retrieved \
- $(APR_UTIL_OBJDIR)/.installed
- cd $(SERF_OLD_SRCDIR) && \
- env CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \
- CC=$(CC) CXX=$(CXX) \
- ./serfmake --with-apr=$(PREFIX)/apr \
- --prefix=$(PREFIX)/serf-old \
- build
- touch $@
-
-# install serf
-$(SERF_OLD_OBJDIR)/.installed: $(SERF_OLD_OBJDIR)/.compiled
- cd $(SERF_OLD_SRCDIR) && \
- ./serfmake --with-apr=$(PREFIX)/apr \
- --with-apr-util=$(PREFIX)/apr \
- --prefix=$(PREFIX)/serf-old \
- install
- touch $@
-
-
-#######################################################################
# sqlite
#######################################################################
@@ -1742,7 +1694,6 @@ $(SVN_OBJDIR)/.retrieved:
ifeq ($(BRANCH_MAJOR),1.7)
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-SERF_FLAG=--with-serf="$(PREFIX)/serf"
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so
MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so
@@ -1753,7 +1704,6 @@ JAVAHL_CHECK_TARGET=check-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
else ifeq ($(BRANCH_MAJOR),1.6)
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-SERF_FLAG=--with-serf="$(PREFIX)/serf"
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so
MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so
@@ -1762,19 +1712,8 @@ W_NO_SYSTEM_HEADERS=-Wno-system-headers
NEON_FLAG=--with-neon="$(PREFIX)/neon"
JAVAHL_CHECK_TARGET=check-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
-else ifeq ($(BRANCH_MAJOR),1.5)
-BDB_FLAG=$(PREFIX)/bdb
-SERF_FLAG=--with-serf="$(PREFIX)/serf-old"
-MOD_DAV_SVN=modules/mod_dav_svn.so
-MOD_AUTHZ_SVN=modules/mod_authz_svn.so
-MOD_DONTDOTHAT=modules/mod_dontdothat.so
-DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check
-W_NO_SYSTEM_HEADERS=-Wno-system-headers
-NEON_FLAG=--with-neon="$(PREFIX)/neon"
-JAVAHL_CHECK_TARGET=check-javahl
else ifeq ($(BRANCH_MAJOR), $(filter 1.8 1.9, $(BRANCH_MAJOR)))
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-SERF_FLAG=--with-serf="$(PREFIX)/serf"
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
# so we have to do that ourselves :(
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
@@ -1786,7 +1725,6 @@ JAVAHL_CHECK_TARGET=check-all-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
else ifeq ($(BRANCH_MAJOR), $(filter 1.10 1.11, 1.12, 1.13 $(BRANCH_MAJOR)))
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-SERF_FLAG=--with-serf="$(PREFIX)/serf"
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
# so we have to do that ourselves :(
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
@@ -1801,7 +1739,6 @@ UTF8PROC_FLAG=--with-utf8proc=internal
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
else # 1.14, trunk
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-SERF_FLAG=--with-serf="$(PREFIX)/serf"
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
# so we have to do that ourselves :(
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
@@ -1847,7 +1784,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
$(BDB_OBJDIR)/.installed $(SQLITE_OBJDIR)/.installed \
$(HTTPD_OBJDIR)/.installed $(CYRUS_SASL_OBJDIR)/.installed \
$(LIBMAGIC_OBJDIR)/.installed $(NEON_OBJDIR)/.installed \
- $(SERF_OBJDIR)/.installed $(SERF_OLD_OBJDIR)/.installed \
+ $(SERF_OBJDIR)/.installed \
$(RUBY_OBJDIR)/.installed $(PYTHON_OBJDIR)/.installed
cd $(SVN_SRCDIR) && ./autogen.sh
$(SWIG_PL_INCLUDES_HACK)
@@ -1870,7 +1807,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
$(NEON_FLAG) \
$(SVN_WITH_HTTPD) \
$(SVN_WITH_SASL) \
- $(SERF_FLAG) \
+ --with-serf="$(PREFIX)/serf" \
--with-sqlite="$(PREFIX)/sqlite" \
--with-zlib="/usr" \
--without-gnome-keyring \
