[omd-commits] OMD Git: omd: mod_python rrdtool: Fixed compilation

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


Module:   omd
Branch:   master
Commit:   89eff5965db08ad76ef6036ee1bf971ce0720736
URL:      http://omdistro.org/projects/omd/repository/revisions/89eff5965db08ad76ef6036ee1bf971ce0720736

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

mod_python rrdtool: Fixed compilation

---

 packages/mod_python/Makefile |   11 +++++++----
 packages/rrdtool/Makefile    |    4 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/mod_python/Makefile b/packages/mod_python/Makefile
index cfcf683..f6b5fdf 100644
--- a/packages/mod_python/Makefile
+++ b/packages/mod_python/Makefile
@@ -25,10 +25,13 @@ build: check-python
 	    echo "applying patches/0008-apache24.patch..." ; \
 	    ( cd $(DIR) ; patch -p1 -b ) < patches/0008-apache24.patch ; \
 	fi
-
-	cd $(DIR) ; ./configure $(CONFIGUREOPTS) 
-	echo '#define OMD_VERSION "$(OMD_VERSION)"' > $(DIR)/src/omd_version.h
-	$(MAKE) -C $(DIR) all
+	
+	export LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib ; \
+	export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
+	cd $(DIR) ; \
+	./configure $(CONFIGUREOPTS) ; \
+	echo '#define OMD_VERSION "$(OMD_VERSION)"' > src/omd_version.h ; \
+	$(MAKE) all
 
 check-python:
 	@if [ ! -d ../python/tmp.python27 ]; then \
diff --git a/packages/rrdtool/Makefile b/packages/rrdtool/Makefile
index 27e69a6..c2ab632 100644
--- a/packages/rrdtool/Makefile
+++ b/packages/rrdtool/Makefile
@@ -3,7 +3,8 @@ include ../../Makefile.omd
 NAME = rrdtool
 VERSION = 1.5.4
 DIR = $(NAME)-$(VERSION)
-PYTHON = $(shell pwd)/../python/tmp.python27/bin/python
+PYTHON = LD_LIBRARY_PATH=$(shell pwd)/../python/tmp.python27/lib \
+	   $(shell pwd)/../python/tmp.python27/bin/python
 
 CONFIGUREOPTS = \
 	--prefix=$(OMD_ROOT) \
@@ -34,6 +35,7 @@ build: check-python
 	  $(MAKE) all
 	
 	# Python binding
+	export LDFLAGS="-L$(shell pwd)/../python/tmp.python27/lib -L$(shell pwd)/../python/tmp.python27/lib/python2.7/config" ; \
 	cd $(DIR)/bindings/python && $(PYTHON) setup.py build
 
 check-python:



More information about the omd-commits mailing list