subversion/patches/0001-subversion-1.9.0-rpath.patch

   1
   2 Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
   3
   4 --- subversion-1.9.0/build.conf.rpath
   5 +++ subversion-1.9.0/build.conf
   6 @@ -561,7 +561,7 @@ lang = python
   7  path = subversion/bindings/swig/python/libsvn_swig_py
   8  libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
   9         apriconv apr python swig
  10 -link-cmd = $(LINK)
  11 +link-cmd = $(LINK_LIB)
  12  install = swig-py-lib
  13  # need special build rule to include -DSWIGPYTHON
  14  compile-cmd = $(COMPILE_SWIG_PY)
  15 @@ -586,7 +586,7 @@ type = swig_lib
  16  lang = ruby
  17  path = subversion/bindings/swig/ruby/libsvn_swig_ruby
  18  libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
  19 -link-cmd = $(LINK) $(SWIG_RB_LIBS)
  20 +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
  21  install = swig-rb-lib
  22  # need special build rule to include
  23  compile-cmd = $(COMPILE_SWIG_RB)
  24 diff -uap subversion-1.9.0/Makefile.in.rpath subversion-1.9.0/Makefile.in
  25 --- subversion-1.9.0/Makefile.in.rpath
  26 +++ subversion-1.9.0/Makefile.in
  27 @@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
  28  COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
  29  COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
  30
  31 -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
  32 -LINK_LIB = $(LINK) $(LT_SO_VERSION)
  33 -LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
  34 -LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
  35 +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
  36 +LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
  37 +LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
  38 +LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
  39
  40  # special link rule for mod_dav_svn
  41  LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)