Author: stsp
Date: Sat Feb 10 19:26:03 2018
New Revision: 1823791

URL: http://svn.apache.org/viewvc?rev=1823791&view=rev
Log:
* Makefile.in: Ensure that libsvn_swig_perl is built before Makefile.PL is
   generated. Fixes the Perl bindings build in parallel mode (make -jN).
   When the problem happened, the Perl bindings .so modules would lack a
   dependency on libsvn_swig_pl.so and the dynamic linker could not load them.

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1823791&r1=1823790&r2=1823791&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Sat Feb 10 19:26:03 2018
@@ -863,7 +863,7 @@ extraclean-swig-headers: clean-swig-head
 $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
        ./config.status subversion/bindings/swig/perl/native/Makefile.PL
 
-$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl 
$(SWIG_PL_DIR)/native/Makefile.PL
        cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
 
 # There is a "readlink -f" command on some systems for the same purpose,
@@ -872,9 +872,7 @@ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_P
 READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
 READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
 
-swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-  $(SWIG_PL_DIR)/native/Makefile
-swig-pl: $(swig-pl_DEPS)
+swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile
        if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) 
$(SWIG_PL_SRC_DIR)`"; then \
          for f in $(SWIG_PL_SRC_DIR)/native/*.c ; do \
             if [ -e "$$f" ] ; then \


Reply via email to