You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/17 13:54:13 UTC

svn commit: r1147584 - /subversion/trunk/tools/dev/unix-build/Makefile.svn

Author: stsp
Date: Sun Jul 17 11:54:13 2011
New Revision: 1147584

URL: http://svn.apache.org/viewvc?rev=1147584&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Attempt to fix a bb-openbsd buildbot
   failure that I cannot reproduce locally for some reason: The ruby bindings
   build might want to invoke bin/python from the manually installed python
   dependency. This needs a proper LD_LIBRARY_PATH to work, so make sure
   LD_LIBRARY_PATH is set when the ruby bindings are built.

Modified:
    subversion/trunk/tools/dev/unix-build/Makefile.svn

Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1147584&r1=1147583&r2=1147584&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Jul 17 11:54:13 2011
@@ -1185,7 +1185,8 @@ $(SVN_OBJDIR)/.bindings-compiled: $(SVN_
 				make swig-py; \
 	fi
 	cd $(svn_builddir) && \
-		PATH=$(PREFIX)/ruby/bin:$$PATH make swig-rb
+		env PATH=$(PREFIX)/ruby/bin:$$PATH \
+		LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make swig-rb
 	if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \
 		cd $(svn_builddir) \
 			&& make swig-pl; \
@@ -1203,7 +1204,8 @@ $(SVN_OBJDIR)/.bindings-installed: $(SVN
 		  	make install-swig-py; \
 	fi
 	cd $(svn_builddir) && \
-		PATH=$(PREFIX)/ruby/bin:$$PATH make install-swig-rb
+		env PATH=$(PREFIX)/ruby/bin:$$PATH \
+		LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) make install-swig-rb
 	if [ $(ENABLE_PERL_BINDINGS) = yes ]; then \
 		cd $(svn_builddir) \
 	    && make install-swig-pl-lib; \