[omd-commits] OMD Git: omd: gearman: gcc44 is required for gearmand on centos 5

git version control git at mathias-kettner.de
Thu Mar 12 22:30:02 CET 2015


Module:   omd
Branch:   master
Commit:   1d34e5689427c6a5d5a1cd97053afa2396efaeb6
URL:      http://omdistro.org/projects/omd/repository/revisions/1d34e5689427c6a5d5a1cd97053afa2396efaeb6

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 12 21:32:04 2015 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 12 21:32:04 2015 +0100

gearman: gcc44 is required for gearmand on centos 5

---

 distros/Makefile.CENTOS_5  |    2 ++
 packages/gearmand/Makefile |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/distros/Makefile.CENTOS_5 b/distros/Makefile.CENTOS_5
index acf52bd..43edcda 100644
--- a/distros/Makefile.CENTOS_5
+++ b/distros/Makefile.CENTOS_5
@@ -6,6 +6,8 @@ BUILD_PACKAGES   += expat-devel
 BUILD_PACKAGES   += fping
 BUILD_PACKAGES   += gcc
 BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += gcc44
+BUILD_PACKAGES   += gcc44-c++
 BUILD_PACKAGES   += libevent-devel
 BUILD_PACKAGES   += libtool-ltdl-devel
 BUILD_PACKAGES   += gd-devel
diff --git a/packages/gearmand/Makefile b/packages/gearmand/Makefile
index dbab689..550a8c6 100644
--- a/packages/gearmand/Makefile
+++ b/packages/gearmand/Makefile
@@ -4,7 +4,7 @@ NAME     = gearmand
 VERSION  = 0.33
 DIR      = gearmand-$(VERSION)
 SHELL    = /bin/bash
-BOOST    = $(shell grep '^\#define\s*BOOST_VERSION\s*[0-9][0-9]*' /usr/include/boost/version.hpp | awk '{ print $$3 }' )
+BOOST    = $(shell grep '^\#define\s*BOOST_VERSION\s*[0-9][0-9]*' /usr/include/boost/version.hpp /usr/include/boost*/boost/version.hpp 2>/dev/null | awk '{ print $$3 }' )
 
 CONFIGUREOPTS = \
     --disable-libmemcached \
@@ -34,8 +34,8 @@ build: clean
 		export LIBS="-lboost_system";  \
 	fi && \
 	cd $(DIR) && \
-	export LIBRARY_PATH=/usr/lib64/boost141:/usr/lib/boost141 && \
-	export LD_LIBRARY_PATH=/usr/lib64/boost141:/usr/lib/boost141 && \
+	export LIBRARY_PATH=$(shell ls -d1 ls -d1 /usr/lib*/boost*/. 2>/dev/null | tr '\n' ':') && \
+	export LD_LIBRARY_PATH=$(shell ls -d1 ls -d1 /usr/lib*/boost*/. 2>/dev/null | tr '\n' ':') && \
 	export CFLAGS=-std=c99 && \
 	export CPATH=/usr/include/boost141 && \
 	./configure $(CONFIGUREOPTS) && \



More information about the omd-commits mailing list