subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1782612 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Sat, 11 Feb 2017 15:23:18 GMT
Author: stsp
Date: Sat Feb 11 15:23:18 2017
New Revision: 1782612

URL: http://svn.apache.org/viewvc?rev=1782612&view=rev
Log:
Fix a library path problem in my custom build script.

* tools/dev/unix-build/Makefile.svn: Fix build problem with Python
   which broke the sqlite3 Python import and hence made running
   SVN tests impossible:
   *** WARNING: renaming "_sqlite3" since importing it failed:
     Cannot load specified object 

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=1782612&r1=1782611&r2=1782612&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sat Feb 11 15:23:18 2017
@@ -1224,6 +1224,7 @@ $(PYTHON_OBJDIR)/.configured: $(PYTHON_O
 		&& env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
 		CPPFLAGS="-I$(PREFIX)/bz2/include" \
 		LDFLAGS="-Wl,-rpath=$(PREFIX)/python/lib -L$(PREFIX)/bz2/lib" \
+		LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \
 		$(PYTHON_SRCDIR)/configure \
 		--prefix=$(PREFIX)/python \
 		--enable-shared \
@@ -1234,12 +1235,18 @@ $(PYTHON_OBJDIR)/.configured: $(PYTHON_O
 
 # compile python
 $(PYTHON_OBJDIR)/.compiled: $(PYTHON_OBJDIR)/.configured
-	(cd $(PYTHON_OBJDIR) && env MAKEFLAGS= make)
+	(cd $(PYTHON_OBJDIR) && \
+		env MAKEFLAGS= \
+		LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \
+		make)
 	touch $@
 
 # install python
 $(PYTHON_OBJDIR)/.installed: $(PYTHON_OBJDIR)/.compiled
-	(cd $(PYTHON_OBJDIR) && env MAKEFLAGS= make install)
+	(cd $(PYTHON_OBJDIR) && \
+		env MAKEFLAGS= \
+		LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \
+		make install)
 	touch $@
 
 



Mime
View raw message