components/developer/subversion/patches/000-Makefile.in.patch

   1 --- subversion-1.14.1/Makefile.in.orig     ::
   2 +++ subversion-1.14.1/Makefile.in          ::
   3 @@ -89,8 +89,8 @@
   4  swig_rb_libdir = @libdir@
   5
   6  ### these possibly need further discussion
   7 -swig_pydir = @libdir@/svn-python/libsvn
   8 -swig_pydir_extra = @libdir@/svn-python/svn
   9 +swig_pydir = @PYTHON_LIB@/libsvn
  10 +swig_pydir_extra = @PYTHON_LIB@/svn
  11  swig_pldir = @libdir@/svn-perl
  12  swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
  13  toolsdir = @bindir@/svn-tools
  14 @@ -150,8 +150,8 @@
  15  SWIG = @SWIG@
  16  SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
  17  SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
  18 -SWIG_PY_LINK = @SWIG_PY_LINK@
  19 -SWIG_PY_LIBS = @SWIG_PY_LIBS@
  20 +SWIG_PY_LINK = @SWIG_PY_LINK@ $(CFLAGS) $(EXTRA_CFLAGS)
  21 +SWIG_PY_LIBS = @SWIG_PY_LIBS@ $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS)
  22  SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
  23  SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
  24  SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@
  25 @@ -198,6 +198,7 @@
  26  ### suppressed (but they may come from httpd or APR).
  27  CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
  28  LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
  29 +EXTRA_SWIG_LDFLAGS = -R$(libdir)
  30  SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
  31  SWIG_FEATURES = @SWIG_FEATURES@
  32  SWIG_PY_FEATURES = @SWIG_PY_FEATURES@
  33 @@ -279,7 +280,7 @@
  34  LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
  35
  36  # special link rule for mod_dav_svn
  37 -LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared
  38 +LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(SVN_APR_LIBS) $(SVN_APRUTIL_LIBS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -shared
  39
  40  # Special LDFLAGS for some libraries
  41  libsvn_client_LDFLAGS = @libsvn_client_LDFLAGS@
  42 @@ -306,7 +307,7 @@
  43  COMPILE_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(LT_CFLAGS) $(CPPFLAGS) $(SWIG_RB_INCLUDES) -prefer-pic -c -o $@
  44
  45  # these commands link the wrapper objects into an extension library/module
  46 -LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module
  47 +LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS) -rpath $(swig_pydir) -avoid-version -module
  48  LINK_RB_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_RB_LINK) $(SWIG_LDFLAGS) -rpath $(swig_rbdir) -avoid-version -module
  49
  50  LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
  51 @@ -881,7 +882,14 @@
  52         ./config.status subversion/bindings/swig/perl/native/Makefile.PL
  53
  54  $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
  55 -       cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
  56 +       (cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL)
  57 +       ( cd $(SWIG_PL_DIR)/native; \
  58 +           for file in Makefile Makefile.client Makefile.delta \
  59 +           Makefile.fs Makefile.ra Makefile.repos Makefile.wc ; do \
  60 +           cp -f $$file $$file.orig ; \
  61 +           sed -e 's;^LD_RUN_PATH.*$$;LD_RUN_PATH=/usr/lib/svn;g' $$file.orig >$$file ; \
  62 +           rm -f $$file.orig ; \
  63 +       done )
  64
  65  # There is a "readlink -f" command on some systems for the same purpose,
  66  # but it's not as portable (e.g. Mac OS X doesn't have it).  These should
  67 @@ -897,13 +905,13 @@
  68             fi; \
  69           done; \
  70         fi
  71 -       cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
  72 +       cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" LD_RUN_PATH="/usr/lib/svn"
  73
  74  check-swig-pl: swig-pl swig-pl-lib
  75         cd $(SWIG_PL_DIR)/native; $(MAKE) test
  76
  77  install-swig-pl: swig-pl install-swig-pl-lib
  78 -       cd $(SWIG_PL_DIR)/native; $(MAKE) install
  79 +       cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor DESTDIR=$(DESTDIR) LD_RUN_PATH=""
  80
  81  EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \
  82                           $(SWIG_PL_SRC_DIR)/native/core.c