Author: stsp
Date: Mon Nov 21 13:32:38 2022
New Revision: 1905433
URL: http://svn.apache.org/viewvc?rev=1905433&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Repair run-time linkage of libserf-1.so
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=1905433&r1=1905432&r2=1905433&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 13:32:38 2022
@@ -959,6 +959,8 @@ $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR
# work around unportable scons shared lib support
-ln -s libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/[0-9]$$/0/') \
$(PREFIX)/serf/lib/libserf-1.so
+ -ln -s libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/[0-9]$$/0/') \
+ $(PREFIX)/serf/lib/libserf-1.so.$(shell echo $(SERF_VER) | sed
-e 's/\.[0-9]$$//')
touch $@
#######################################################################
@@ -1805,7 +1807,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
$(SWIG_PL_INCLUDES_HACK)
$(SWIG_PL_LINK_HACK)
cd $(svn_builddir) && \
- env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib
$(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib -L$(PREFIX)/iconv/lib" \
+ env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib
-L$(PREFIX)/serf/lib $(SERF_LDFLAG) $(LZ4_LDFLAG) -L$(PREFIX)/gettext/lib
-L$(PREFIX)/iconv/lib" \
CC=$(CC) CXX=$(CXX) \
CFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG" \
CXXFLAGS="-I$(PREFIX)/gettext/include -DAPR_POOL_DEBUG"
\
