f03a66a
f03a66a
Libraries should be linked with -rpath $libdir but programs should not.
f03a66a
Doing so for the latter means that a redundant RPATH entry of $libdir
f03a66a
will end up in the binaries.
f03a66a
f03a66a
The redundant RPATH can also cause obscure build failures by causing
f03a66a
in-build binaries to pick up libraries from the system environment,
f03a66a
which libtool will otherwise avoid.
f03a66a
f03a66a
--- subversion-1.6.1/build.conf.rpath
f03a66a
+++ subversion-1.6.1/build.conf
f03a66a
@@ -472,7 +472,7 @@ type = swig_lib
f03a66a
 lang = python
f03a66a
 path = subversion/bindings/swig/python/libsvn_swig_py
f03a66a
 libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
f03a66a
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
f03a66a
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
f03a66a
 install = swig-py-lib
f03a66a
 # need special build rule to include -DSWIGPYTHON
f03a66a
 compile-cmd = $(COMPILE_SWIG_PY)
f03a66a
@@ -495,7 +495,7 @@ type = swig_lib
f03a66a
 lang = ruby
f03a66a
 path = subversion/bindings/swig/ruby/libsvn_swig_ruby
f03a66a
 libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
f03a66a
-link-cmd = $(LINK) $(SWIG_RB_LIBS)
f03a66a
+link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
f03a66a
 install = swig-rb-lib
f03a66a
 # need special build rule to include
f03a66a
 compile-cmd = $(COMPILE_SWIG_RB)
f03a66a
--- subversion-1.6.1/build/generator/gen_base.py.rpath
f03a66a
+++ subversion-1.6.1/build/generator/gen_base.py
f03a66a
@@ -455,6 +455,10 @@ class TargetLib(TargetLinked):
f03a66a
     self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
f03a66a
     self.msvc_export = options.get('msvc-export', '').split()
f03a66a
 
f03a66a
+    ### hmm. this is Makefile-specific
f03a66a
+    if self.link_cmd == '$(LINK)':
f03a66a
+      self.link_cmd = '$(LINK_LIB)'
f03a66a
+
f03a66a
 class TargetApacheMod(TargetLib):
f03a66a
 
f03a66a
   def __init__(self, name, options, gen_obj):
f03a66a
--- subversion-1.6.1/Makefile.in.rpath
f03a66a
+++ subversion-1.6.1/Makefile.in
f03a66a
@@ -184,7 +184,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
f03a66a
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
f03a66a
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
f03a66a
 
f03a66a
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
f03a66a
+LINK_LIB = $(LINK) -rpath $(libdir)
f03a66a
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
f03a66a
 LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
f03a66a
 
f03a66a
 # special link rule for mod_dav_svn