[checkmk-commits] Fix PyNaCL installation.

Module: check_mk Branch: master Commit: 7fffa1288db842a2ade2964ba363529bd2310278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fffa1288db842… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 6 09:06:31 2018 +0100 Fix PyNaCL installation. Change-Id: I42c38ad78ec68f048d504016a63f51bd6340e63a --- omd/packages/python-modules/python-modules.make | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 0089c7c..76f0e4e 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -227,9 +227,9 @@ $(PYTHON_MODULES_PATCHING): $(PYTHON_MODULES_UNPACK) done $(TOUCH) $@ -$(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PYTHON_MODULES_LIST)) $(PYTHON_MODULES_PATCHES) $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches +$(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PYTHON_MODULES_LIST)) $(PYTHON_MODULES_PATCHES) $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches $(RM) -r $(PYTHON_MODULES_DIR) - $(MKDIR) $(PYTHON_MODULES_DIR) + $(MKDIR) $(PYTHON_MODULES_DIR) cd $(PYTHON_MODULES_DIR) && \ for M in $(PYTHON_MODULES_LIST); do \ echo "Unpacking $$M..." ; \ @@ -242,9 +242,14 @@ $(PYTHON_MODULES_UNPACK): $(addprefix $(PACKAGE_DIR)/$(PYTHON_MODULES)/src/,$(PY $(MKDIR) $(BUILD_HELPER_DIR) $(TOUCH) $@ +# NOTE: Setting SODIUM_INSTALL variable below is an extremely cruel hack to +# avoid installing libsodium headers and libraries. The need for this hack +# arises because of our "interesting" flag use for "setup.py install" and our +# double installation. We should really switch to e.g. pipenv here. $(PYTHON_MODULES_INSTALL): $(PYTHON_MODULES_BUILD) $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/python set -e ; cd $(PYTHON_MODULES_DIR) ; \ + export SODIUM_INSTALL="system" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_MODULES_PYTHONPATH)" ; \ export PYTHONPATH=$$PYTHONPATH:"$(PACKAGE_PYTHON_PYTHONPATH)" ; \ export CPATH="$(PACKAGE_FREETDS_DESTDIR)/include" ; \