| |
| Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables. |
| |
| diff -uap subversion-1.10.0/build.conf.rpath subversion-1.10.0/build.conf |
| |
| |
| @@ -568,7 +568,7 @@ |
| 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) |
| @@ -594,7 +594,7 @@ |
| 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.10.0/Makefile.in.rpath subversion-1.10.0/Makefile.in |
| |
| |
| @@ -264,10 +264,10 @@ |
| COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c |
| COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_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) -shared |