From abc80b7782789bad3814b4abe2c259d2bc3db6a4 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 17 Aug 2017 15:05:58 +0200 Subject: [PATCH] prepare_port sel4: check required python modules This prevents undescriptive errors when building sel4. Ref #2490 --- repos/base-sel4/ports/sel4.hash | 2 +- repos/base-sel4/ports/sel4.port | 3 +++ tool/ports/mk/install.mk | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/repos/base-sel4/ports/sel4.hash b/repos/base-sel4/ports/sel4.hash index 7ede8150a..83cc303c7 100644 --- a/repos/base-sel4/ports/sel4.hash +++ b/repos/base-sel4/ports/sel4.hash @@ -1 +1 @@ -112234357bb0cd71d9401f183734fa5b784543e1 +8ab77c39000530e8f78a66581bf368a902cbcdc3 diff --git a/repos/base-sel4/ports/sel4.port b/repos/base-sel4/ports/sel4.port index 85ddf10c5..05d10d455 100644 --- a/repos/base-sel4/ports/sel4.port +++ b/repos/base-sel4/ports/sel4.port @@ -8,6 +8,9 @@ REV(sel4) := 8564ace4dfb622ec69e0f7d762ebfbc8552ec918 DIR(sel4) := src/kernel/sel4 $(call check_tool,python) +$(call check_python_module,future) +$(call check_python_module,tempita) +$(call check_python_module,ply) PATCHES := $(wildcard $(REP_DIR)/patches/*.patch) diff --git a/tool/ports/mk/install.mk b/tool/ports/mk/install.mk index 4fc45ff39..e298577d4 100644 --- a/tool/ports/mk/install.mk +++ b/tool/ports/mk/install.mk @@ -25,6 +25,11 @@ STRICT_HASH ?= no # check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.)) +# +# Utility to check if a python module is installed +# +check_python_module = $(if $(shell python -c "import $(1)" 2>&1),$(error Need to have python module '$(1)' installed.),) + default: .NOTPARALLEL: default