packages/rpm/rhel-3/subversion-0.31.0-rpath.patch

   1
   2 Only pass -rpath $(libdir) on the link line when linking libraries,
   3 not programs.
   4
   5 --- subversion-0.31.0/build/generator/gen_base.py.rpath
   6 +++ subversion-0.31.0/build/generator/gen_base.py
   7 @@ -421,6 +421,9 @@
   8      tfile = '%s-%s%s' % (name, cfg.version, extmap['lib', 'target'])
   9      self.filename = os.path.join(self.path, tfile)
  10
  11 +    ### hmm. this is Makefile-specific
  12 +    self.link_cmd = '$(LINK_LIB)'
  13 +
  14  class TargetApacheMod(TargetLib):
  15
  16    def __init__(self, name, options, cfg, extmap):
  17 --- subversion-0.31.0/Makefile.in.rpath
  18 +++ subversion-0.31.0/Makefile.in
  19 @@ -127,7 +127,8 @@
  20  COMPILE_SWIG_JAVA = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_JAVA_INCLUDES) $(INCLUDES) -o $@ -c
  21  COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c
  22
  23 -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
  24 +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
  25 +LINK_LIB = $(LINK) -rpath $(libdir)
  26
  27  # special link rule for mod_dav_svn
  28  LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module