[omd-commits] OMD Git: omd: python-modules: Modules can now depend on eachother

git version control git at mathias-kettner.de
Sun Jun 5 22:33:18 CEST 2016


Module:   omd
Branch:   master
Commit:   027cdd0855982ba7dafb071a7f3bb18773a69acd
URL:      http://omdistro.org/projects/omd/repository/revisions/027cdd0855982ba7dafb071a7f3bb18773a69acd

Author:   Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:33:12 2016 +0200
Commiter: Lars Michelsen <lm at larsmichelsen.com>
Date:     Sun Jun  5 22:33:12 2016 +0200

python-modules: Modules can now depend on eachother

---

 packages/mod_python/Makefile       |    1 +
 packages/python-modules/.gitignore |    1 +
 packages/python-modules/Makefile   |    9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index f6b5fdf..c87e7b5 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -42,6 +42,7 @@ check-python:
 install:
 	# Use 'make install' of mod_python into a temporary file.
 	# mod_python does not honor --prefix, so we move the stuff over...
+	export LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib ; \
 	make DESTDIR=$$(pwd)/tmp.root -C $(DIR) install
 	
 	# Installation directories vary much
diff --git a/packages/python-modules/.gitignore b/packages/python-modules/.gitignore
index 89ea643..b937e82 100644
--- a/packages/python-modules/.gitignore
+++ b/packages/python-modules/.gitignore
@@ -1 +1,2 @@
 dest
+tmp.python
diff --git a/packages/python-modules/Makefile b/packages/python-modules/Makefile
index 724c972..bae685e 100644
--- a/packages/python-modules/Makefile
+++ b/packages/python-modules/Makefile
@@ -48,6 +48,9 @@ build: check-python
 	    fi ; \
 	done
 	set -e ; cd dest && \
+	    TMP_INSTALL_PATH=$(shell pwd)/tmp.python ; \
+	    mkdir $$TMP_INSTALL_PATH/lib || true; \
+	    export PYTHONPATH=$$PYTHONPATH:$$TMP_INSTALL_PATH/lib ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(DESTDIR)$(OMD_ROOT)/lib/python ; \
 	    export PYTHONPATH=$$PYTHONPATH:$(shell pwd)/../python/tmp.python27/lib/python2.7 ; \
 	    export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
@@ -55,6 +58,10 @@ build: check-python
 		echo "Building $$M..." ; \
 		cd $$M ; \
 	        $(PYTHON) setup.py build ; \
+	        $(PYTHON) setup.py install --home=$$TMP_INSTALL_PATH \
+	            --prefix='' \
+	            --install-platlib=$$TMP_INSTALL_PATH/lib \
+	            --install-purelib=$$TMP_INSTALL_PATH/lib ; \
 	        cd .. ; \
 	    done
 
@@ -87,4 +94,4 @@ install:
 skel:
 
 clean:
-	rm -rf dest
+	rm -rf dest tmp.python



More information about the omd-commits mailing list