| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- diff -uap subversion-1.7.0/build.conf.rpath subversion-1.7.0/build.conf
- --- subversion-1.8.0/build.conf.rpath
- +++ subversion-1.8.0/build.conf
- @@ -501,7 +501,7 @@ type = swig_lib
- lang = python
- path = subversion/bindings/swig/python/libsvn_swig_py
- libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr
- -link-cmd = $(LINK)
- +link-cmd = $(LINK_LIB)
- install = swig-py-lib
- # need special build rule to include -DSWIGPYTHON
- compile-cmd = $(COMPILE_SWIG_PY)
- @@ -524,7 +524,7 @@ type = swig_lib
- lang = ruby
- path = subversion/bindings/swig/ruby/libsvn_swig_ruby
- libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr
- -link-cmd = $(LINK) $(SWIG_RB_LIBS)
- +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS)
- install = swig-rb-lib
- # need special build rule to include
- compile-cmd = $(COMPILE_SWIG_RB)
- --- subversion-1.8.0/build/generator/gen_base.py.rpath
- +++ subversion-1.8.0/build/generator/gen_base.py
- @@ -514,6 +514,10 @@ class TargetLib(TargetLinked):
- self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
- self.msvc_export = options.get('msvc-export', '').split()
-
- + ### hmm. this is Makefile-specific
- + if self.link_cmd == '$(LINK)':
- + self.link_cmd = '$(LINK_LIB)'
- +
- class TargetApacheMod(TargetLib):
-
- def __init__(self, name, options, gen_obj):
- --- subversion-1.8.0/Makefile.in.rpath
- +++ subversion-1.8.0/Makefile.in
- @@ -201,8 +201,8 @@ COMPILE_JAVAHL_JAVAH = $(JAVAH)
- # special compilation for files destined for cxxhl
- COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
-
- -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
- -LINK_LIB = $(LINK) $(LT_SO_VERSION)
- +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
- +LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
- LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
|
