[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Makefile.svn: Make stock SVN executable configurable

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 8 Jan 2011 13:51:28 +0200

[ moving stsp to bcc ]

What problem does this fix?

Ramkumar Ramachandra wrote on Sat, Jan 08, 2011 at 14:33:46 +0530:
> [[[
> Makefile.svn: Make stock SVN binary configurable
>
> * tools/dev/unix-build/Makefile.svn: Introduce a new variable
> $STOCK_SVN that defaults to `env LD_LIBRARY_PATH= svn`. Change
> references to `svn export` and `svn co` to use $STOCK_SVN.
> ]]]
>
> Index: tools/dev/unix-build/Makefile.svn
> ===================================================================
> --- tools/dev/unix-build/Makefile.svn (revision 1056662)
> +++ tools/dev/unix-build/Makefile.svn (working copy)
> @@ -10,6 +10,9 @@ ENABLE_JAVA_BINDINGS ?= no # they don't build with
> USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv
> PARALLEL ?= PARALLEL=1 CLEANUP=1
>
> +# Assumes that `svn` is in $PATH and uses distribution APR libraries
> +STOCK_SVN = env LD_LIBRARY_PATH= svn
> +
> PWD = $(shell pwd)
> UNAME = $(shell uname)
>
> @@ -230,7 +233,7 @@ apr-clean:
> $(APR_OBJDIR)/.retrieved:
> [ -d $(APR_OBJDIR) ] || mkdir -p $(APR_OBJDIR)
> if [ ! -d $(APR_SRCDIR) ]; then \
> - svn export $(APR_URL)/tags/$(APR_VER)/ $(APR_SRCDIR); \
> + $(STOCK_SVN) export $(APR_URL)/tags/$(APR_VER)/ $(APR_SRCDIR); \
> fi
> touch $@
>
> @@ -426,7 +429,7 @@ apr-util-clean:
> $(APR_UTIL_OBJDIR)/.retrieved:
> [ -d $(APR_UTIL_OBJDIR) ] || mkdir -p $(APR_UTIL_OBJDIR)
> if [ ! -d $(APR_UTIL_SRCDIR) ]; then \
> - svn export $(APR_UTIL_URL)/tags/$(APR_UTIL_VER)/ \
> + $(STOCK_SVN) export $(APR_UTIL_URL)/tags/$(APR_UTIL_VER)/ \
> $(APR_UTIL_SRCDIR); \
> fi
> touch $@
> @@ -622,7 +625,7 @@ serf-clean:
> $(SERF_OBJDIR)/.retrieved:
> [ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
> if [ ! -d $(SERF_SRCDIR) ]; then \
> - svn export $(SERF_URL) $(SERF_SRCDIR); \
> + $(STOCK_SVN) export $(SERF_URL) $(SERF_SRCDIR); \
> fi
> touch $@
>
> @@ -663,7 +666,7 @@ serf-old-clean:
> $(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); \
> + $(STOCK_SVN) export $(SERF_OLD_URL) $(SERF_OLD_SRCDIR); \
> fi
> touch $@
>
> @@ -842,7 +845,7 @@ $(SVN_OBJDIR)/.retrieved:
> co="co"; \
> fi; \
> if [ ! -d $(SVN_WC) ] && [ ! -h $(SVN_WC) ]; then \
> - svn $${co} $(SUBVERSION_REPOS_URL)/$${branchdir} \
> + $(STOCK_SVN) $${co} $(SUBVERSION_REPOS_URL)/$${branchdir} \
> $(SVN_WC); \
> fi
> touch $@
Received on 2011-01-08 12:55:07 CET

This is an archived mail posted to the Subversion Dev mailing list.