subversion/patches/001-subversion-1.7.0-rpath.patch

   1 diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf
   2 --- subversion-1.7.0/build.conf.rpath   2011-08-04 21:18:50.000000000 +0100
   3 +++ subversion-1.7.0/build.conf 2011-10-12 09:23:43.844525530 +0100
   4 @@ -478,7 +478,7 @@ type = swig_lib
   5  lang = python
   6  path = subversion/bindings/swig/python/libsvn_swig_py
   7  libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
   8 -link-cmd = $(LINK)
   9 +link-cmd = $(LINK_LIB)
  10  install = swig-py-lib
  11  # need special build rule to include -DSWIGPYTHON
  12  compile-cmd = $(COMPILE_SWIG_PY)
  13 @@ -501,7 +501,7 @@ type = swig_lib
  14  lang = ruby
  15  path = subversion/bindings/swig/ruby/libsvn_swig_ruby
  16  libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
  17 -link-cmd = $(LINK) $(SWIG_RB_LIBS)
  18 +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
  19  install = swig-rb-lib
  20  # need special build rule to include
  21  compile-cmd = $(COMPILE_SWIG_RB)
  22 diff -uap subversion-1.7.0/build/generator/gen_base.py.rpath subversion-1.7.0/build/generator/gen_base.py
  23 --- subversion-1.7.0/build/generator/gen_base.py.rpath  2011-06-22 17:44:54.000000000 +0100
  24 +++ subversion-1.7.0/build/generator/gen_base.py        2011-10-12 09:23:15.368649375 +0100
  25 @@ -506,6 +506,10 @@ class TargetLib(TargetLinked):
  26      self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
  27      self.msvc_export = options.get('msvc-export', '').split()
  28
  29 +    ### hmm. this is Makefile-specific
  30 +    if self.link_cmd == '$(LINK)':
  31 +      self.link_cmd = '$(LINK_LIB)'
  32 +
  33  class TargetApacheMod(TargetLib):
  34
  35    def __init__(self, name, options, gen_obj):
  36 diff -uap subversion-1.7.0/Makefile.in.rpath subversion-1.7.0/Makefile.in
  37 --- subversion-1.7.0/Makefile.in.rpath  2011-07-16 12:50:53.000000000 +0100
  38 +++ subversion-1.7.0/Makefile.in        2011-10-12 09:24:36.165524732 +0100
  39 @@ -203,8 +203,8 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
  40  COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
  41  COMPILE_JAVAHL_JAVAH = $(JAVAH)
  42
  43 -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
  44 -LINK_LIB = $(LINK) $(LT_SO_VERSION)
  45 +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
  46 +LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
  47  LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
  48  LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
  49