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 18:07:26 UTC

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

Author: stsp
Date: Sun Jul 17 16:07:26 2011
New Revision: 1147670

URL: http://svn.apache.org/viewvc?rev=1147670&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Attempt to fix failing tests on
   the bb-openbsd buildbot by liking python with -rpath, making sure
   the python binary can always find its libpython library file no matter
   what LD_LIBRARY_PATH says. The python build system does not link the
   python binary with -rpath by default, which is odd since build systems
   of most other dependecies (e.g. ruby) do this automatically.

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=1147670&r1=1147669&r2=1147670&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Jul 17 16:07:26 2011
@@ -1002,6 +1002,7 @@ endif
 $(PYTHON_OBJDIR)/.configured: $(PYTHON_OBJDIR)/.retrieved
 	cd $(PYTHON_OBJDIR) \
 		&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
+		LDFLAGS="-Wl,-rpath=$(PREFIX)/python/lib" \
 		$(PYTHON_SRCDIR)/configure \
 		--prefix=$(PREFIX)/python \
 		--enable-shared \