LineageOS/android_external_dtc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pylibfdt: Use Makefile constructs to implement NO_PYTHON

Browse Source 
The current mechanism uses a shell construct, but it seems better to use
a Makefile approach.

Signed-off-by: Simon Glass <sjg@chromium.org>
Suggested-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Simon Glass
2017-04-07 15:51:33 -06:00
committed by David Gibson
parent 90db6d9989
commit 896f1c1332
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -117,10 +117,11 @@ BIN += fdtput
SCRIPTS = dtdiff SCRIPTS = dtdiff
all: $(BIN) libfdt
# We need both Python and swig to build pylibfdt. # We need both Python and swig to build pylibfdt.
.PHONY: maybe_pylibfdt .PHONY: maybe_pylibfdt
maybe_pylibfdt: FORCE maybe_pylibfdt: FORCE
if [ -n "${NO_PYTHON}" ]; then exit; fi; \
if $(PKG_CONFIG) --cflags python >/dev/null 2>&1; then \ if $(PKG_CONFIG) --cflags python >/dev/null 2>&1; then \
if which swig >/dev/null 2>&1; then \ if which swig >/dev/null 2>&1; then \
can_build=yes; \ can_build=yes; \
@@ -132,7 +133,9 @@ maybe_pylibfdt: FORCE
echo "## Skipping pylibfdt (install python dev and swig to build)"; \ echo "## Skipping pylibfdt (install python dev and swig to build)"; \
fi fi
all: $(BIN) libfdt maybe_pylibfdt ifeq ($(NO_PYTHON),)
all: maybe_pylibfdt
endif
ifneq ($(DEPTARGETS),) ifneq ($(DEPTARGETS),)
@@ -195,7 +198,11 @@ install-includes:
$(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)
$(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR)
install: install-bin install-lib install-includes maybe_install_pylibfdt install: install-bin install-lib install-includes
ifeq ($(NO_PYTHON),)
install: install_pylibfdt
endif
$(VERSION_FILE): Makefile FORCE $(VERSION_FILE): Makefile FORCE
$(call filechk,version) $(call filechk,version)
@@ -267,7 +274,9 @@ TESTS_BIN += convert-dtsv0
TESTS_BIN += fdtput TESTS_BIN += fdtput
TESTS_BIN += fdtget TESTS_BIN += fdtget
TESTS_BIN += fdtdump TESTS_BIN += fdtdump
ifeq ($(NO_PYTHON),)
TESTS_PYLIBFDT += maybe_pylibfdt TESTS_PYLIBFDT += maybe_pylibfdt
endif
include tests/Makefile.tests include tests/Makefile.tests

7
pylibfdt/Makefile.pylibfdt
View File

@@ -25,11 +25,4 @@ install_pylibfdt: $(WRAP) $(PYMODULE)
$(call run_setup, $(PYLIBFDT_srcs) $(WRAP), \ $(call run_setup, $(PYLIBFDT_srcs) $(WRAP), \
install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX))) install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX)))
maybe_install_pylibfdt:
if [ -e $(PYMODULE) ]; then \
if [ -z "$(NO_PYTHON)" ]; then \
$(MAKE) install_pylibfdt; \
fi; \
fi
PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.so PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.so