[checkmk-commits] Improve RE2 installation.

Module: check_mk Branch: master Commit: f1cdd5c845137622698d316c98213bd7f3b9c367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cdd5c8451376… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 15:00:07 2018 +0100 Improve RE2 installation. Change-Id: I0c17bbaa8d80c7f3a6fc633f8d985e61528cc4af --- omd/packages/re2/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index aee377c..2a7c9a0 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -24,10 +24,17 @@ build: echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ - $(MAKE) -C $(DIR) CXX="$$CXX" prefix=$(OMD_ROOT) && \ - $(MAKE) -C $(DIR) CXX="$$CXX" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix="" install + $(MAKE) -C $(DIR) CXX="$$CXX" CPPFLAGS="-DRE2_ON_VALGRIND" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix=$(OMD_ROOT) install +# TODO(sp): What should we do about RE2_ON_VALGRIND? +# Massage paths a bit by moving things around. + mv $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/include $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/lib $(PACKAGE_RE2_DESTDIR) + rm -rf $(PACKAGE_RE2_DESTDIR)/$(OMD_BASE) +# The RE2 Makefile offers no mechanism to strip the libraries. :-/ + strip $(PACKAGE_RE2_DESTDIR)/lib/*.a $(PACKAGE_RE2_DESTDIR)/lib/*.so install: + mkdir -p $(DESTDIR)$(OMD_ROOT) + cp -a $(PACKAGE_RE2_DESTDIR)/include $(PACKAGE_RE2_DESTDIR)/lib $(DESTDIR)$(OMD_ROOT) skel: