42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
|
|
||
|
|
Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
|
||
|
|
|
||
|
|
--- subversion-1.9.0/build.conf.rpath
|
||
|
|
+++ subversion-1.9.0/build.conf
|
||
|
|
@@ -561,7 +561,7 @@ lang = python
|
||
|
|
path = subversion/bindings/swig/python/libsvn_swig_py
|
||
|
|
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
|
||
|
|
apriconv apr python swig
|
||
|
|
-link-cmd = $(LINK)
|
||
|
|
+link-cmd = $(LINK_LIB)
|
||
|
|
install = swig-py-lib
|
||
|
|
# need special build rule to include -DSWIGPYTHON
|
||
|
|
compile-cmd = $(COMPILE_SWIG_PY)
|
||
|
|
@@ -586,7 +586,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 ruby swig
|
||
|
|
-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)
|
||
|
|
diff -uap subversion-1.9.0/Makefile.in.rpath subversion-1.9.0/Makefile.in
|
||
|
|
--- subversion-1.9.0/Makefile.in.rpath
|
||
|
|
+++ subversion-1.9.0/Makefile.in
|
||
|
|
@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
|
||
|
|
COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
|
||
|
|
COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
|
||
|
|
|
||
|
|
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||
|
|
-LINK_LIB = $(LINK) $(LT_SO_VERSION)
|
||
|
|
-LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||
|
|
-LINK_CXX_LIB = $(LINK_CXX) $(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)
|
||
|
|
+LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
|
||
|
|
|
||
|
|
# special link rule for mod_dav_svn
|
||
|
|
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
|