[checkmk-commits] Build mk-livestatus with RE2, hopefully...

Module: check_mk Branch: master Commit: c3cda061c84c8be9c423bb2126d275250f06917b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3cda061c84c8b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 17:24:54 2018 +0100 Build mk-livestatus with RE2, hopefully... Change-Id: I8649cae38d943625dd6d33b276d0858311c70798 --- omd/packages/mk-livestatus/mk-livestatus.make | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/omd/packages/mk-livestatus/mk-livestatus.make b/omd/packages/mk-livestatus/mk-livestatus.make index a2a8d93..07eb10f 100644 --- a/omd/packages/mk-livestatus/mk-livestatus.make +++ b/omd/packages/mk-livestatus/mk-livestatus.make @@ -1,8 +1,6 @@ MK_LIVESTATUS := mk-livestatus MK_LIVESTATUS_DIR := $(MK_LIVESTATUS)-$(CMK_VERSION) -CXX_FLAGS := -g -O3 -Wall -Wextra -BOOST_OPT := --with-boost=$(PACKAGE_BOOST_DESTDIR) # Attention: copy-n-paste from check_mk/Makefile below... MK_LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-build MK_LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-install @@ -16,11 +14,10 @@ $(MK_LIVESTATUS)-install: $(MK_LIVESTATUS_INSTALL) $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz: $(MAKE) -C $(REPO_PATH) $(MK_LIVESTATUS_DIR).tar.gz -$(MK_LIVESTATUS_BUILD): $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz $(BOOST_BUILD) +$(MK_LIVESTATUS_BUILD): $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz $(BOOST_BUILD) $(RE2_BUILD) $(TAR_GZ) $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz cd $(MK_LIVESTATUS_DIR) ; \ - $(ECHO) ./configure CXXFLAGS="$(CXX_FLAGS)" $(BOOST_OPT) --prefix=$(OMD_ROOT) ; \ - ./configure CXXFLAGS="$(CXX_FLAGS)" $(BOOST_OPT) --prefix=$(OMD_ROOT) + ./configure CXXFLAGS="-g -O3 -Wall -Wextra" --with-boost=$(PACKAGE_BOOST_DESTDIR) --with-re2=$(PACKAGE_RE2_DESTDIR) --prefix=$(OMD_ROOT) $(MAKE) -C $(MK_LIVESTATUS_DIR) all $(TOUCH) $@