|
 |
12108fd |
|
|
|
12108fd |
Libraries should be linked with -rpath $libdir but programs should not.
|
|
|
12108fd |
Doing so for the latter means that a redundant RPATH entry of $libdir
|
|
|
12108fd |
will end up in the binaries.
|
|
|
12108fd |
|
|
|
12108fd |
The redundant RPATH can also cause obscure build failures by causing
|
|
|
12108fd |
in-build binaries to pick up libraries from the system environment,
|
|
|
12108fd |
which libtool will otherwise avoid.
|
|
|
12108fd |
|
|
|
abad95c |
--- subversion-1.6.0/build/generator/gen_base.py.rpath
|
|
|
abad95c |
+++ subversion-1.6.0/build/generator/gen_base.py
|
|
|
abad95c |
@@ -455,6 +455,9 @@ class TargetLib(TargetLinked):
|
|
|
e8325ad |
self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target
|
|
|
abad95c |
self.msvc_export = options.get('msvc-export', '').split()
|
|
|
e8325ad |
|
|
|
e8325ad |
+ ### hmm. this is Makefile-specific
|
|
|
e8325ad |
+ self.link_cmd = '$(LINK_LIB)'
|
|
|
e8325ad |
+
|
|
|
e8325ad |
class TargetApacheMod(TargetLib):
|
|
|
e8325ad |
|
|
|
e8325ad |
def __init__(self, name, options, gen_obj):
|
|
|
abad95c |
--- subversion-1.6.0/Makefile.in.rpath
|
|
|
abad95c |
+++ subversion-1.6.0/Makefile.in
|
|
|
abad95c |
@@ -184,6 +184,7 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
|
|
|
e8325ad |
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
|
|
|
e8325ad |
COMPILE_JAVAHL_JAVAH = $(JAVAH)
|
|
|
e8325ad |
|
|
|
e8325ad |
+LINK_LIB = $(LINK) -rpath $(libdir)
|
|
|
abad95c |
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
|
|
|
abad95c |
LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
|
|
|
e8325ad |
|