Avoid installing pylibfdt when dependencies are missing
PATCH 1/1 Avoid installing pylibfdt when dependencies are missing
At present we have a build check that python-dev and swig are available. If they are not, we print a message and skip building pylibfdt.
However this check is not currently present with 'make install'. The install is attempted, and fails. See crbug.com/789189
Split the check out into a separate script and use it twice, once for the build and once for the install. This corrects the error.
---
Makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
Makefile +16 -8
@@ -126,19 +126,23 @@ SCRIPTS = dtdiff all: $(BIN) libfdt -# We need both Python and swig to build pylibfdt. -.PHONY: maybe_pylibfdt -maybe_pylibfdt: FORCE +# We need both Python and swig to build/install pylibfdt. +# This builds the given make ${target} if those deps are found. +check_python_deps = \ if $(PKG_CONFIG) --cflags python2 >/dev/null 2>&1; then \ if which swig >/dev/null 2>&1; then \ can_build=yes; \ fi; \ fi; \ - if [ "$$can_build" = "yes" ]; then \ - $(MAKE) pylibfdt; \ + if [ "$${can_build}" = "yes" ]; then \ + $(MAKE) $${target}; \ else \ - echo "## Skipping pylibfdt (install python dev and swig to build)"; \ - fi + echo "\#\# Skipping pylibfdt (install python dev and swig to build)"; \ + fi ; + +.PHONY: maybe_pylibfdt +maybe_pylibfdt: FORCE + target=pylibfdt; $(check_python_deps) ifeq ($(NO_PYTHON),) all: maybe_pylibfdt
@@ -208,8 +212,12 @@ install-includes: install: install-bin install-lib install-includes +.PHONY: maybe_install_pylibfdt +maybe_install_pylibfdt: FORCE + target=install_pylibfdt; $(check_python_deps) + ifeq ($(NO_PYTHON),) -install: install_pylibfdt +install: maybe_install_pylibfdt endif $(VERSION_FILE): Makefile FORCE
Signature · 1 line
2.16.0.rc0.223.g4a4ac83678-goog
A message that is not in the archive (sent off-list or not yet received): 20180105185412.167666-1-sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
David Gibson
AppliedQuoted 11 lines · Simon Glass
At present we have a build check that python-dev and swig are available. If they are not, we print a message and skip building pylibfdt.
However this check is not currently present with 'make install'. The install is attempted, and fails. See crbug.com/789189
Split the check out into a separate script and use it twice, once for the build and once for the install. This corrects the error.
Reported-by Mike Frysinger <[email protected]>Signed-off-by Simon Glass <[email protected]>
Applied, thanks.
Quoted 54 lines
---
Makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)Makefile +16
-8@@ -126,19 +126,23 @@ SCRIPTS = dtdiff all: $(BIN) libfdt -# We need both Python and swig to build pylibfdt. -.PHONY: maybe_pylibfdt -maybe_pylibfdt: FORCE +# We need both Python and swig to build/install pylibfdt. +# This builds the given make ${target} if those deps are found. +check_python_deps = \ if $(PKG_CONFIG) --cflags python2 >/dev/null 2>&1; then \ if which swig >/dev/null 2>&1; then \ can_build=yes; \ fi; \ fi; \ - if [ "$$can_build" = "yes" ]; then \ - $(MAKE) pylibfdt; \ + if [ "$${can_build}" = "yes" ]; then \ + $(MAKE) $${target}; \ else \ - echo "## Skipping pylibfdt (install python dev and swig to build)"; \ - fi + echo "\#\# Skipping pylibfdt (install python dev and swig to build)"; \ + fi ; + +.PHONY: maybe_pylibfdt +maybe_pylibfdt: FORCE + target=pylibfdt; $(check_python_deps) ifeq ($(NO_PYTHON),) all: maybe_pylibfdt@@ -208,8 +212,12 @@ install-includes: install: install-bin install-lib install-includes +.PHONY: maybe_install_pylibfdt +maybe_install_pylibfdt: FORCE + target=install_pylibfdt; $(check_python_deps) + ifeq ($(NO_PYTHON),) -install: install_pylibfdt +install: maybe_install_pylibfdt endif $(VERSION_FILE): Makefile FORCE
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson