diff options
| author |  Peter Korsgaard <peter@korsgaard.com> | 2019-12-01 21:55:37 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2019-12-05 21:48:34 +0100 |
| commit | 154456c031b4e2ec4ffe1bfbd578fcfd7cc698e5 (patch) | |
| tree | 4bc1140d5d4b5caa5a440b2ceda5e542c7de799d | |
| parent | f2c01b9a39837b9ff45b29504007e66025904b31 (diff) | |
| download | buildroot-154456c031b4e2ec4ffe1bfbd578fcfd7cc698e5.tar.gz buildroot-154456c031b4e2ec4ffe1bfbd578fcfd7cc698e5.tar.bz2 | |
package/{pkg-generic, python, python3}: rename .py file exclusion variable to not conflict
Fixes:
http://autobuild.buildroot.net/results/3b6/3b6280b0b7a9634b747db2865b21c6266007c725/
The PYTHON_KEEP_PY_FILES global variable conflicts with the per-package
<pkg>_KEEP_PY_FILES variable for the python package, causing make to
complain:
package/zlib/zlib.mk:7: *** Recursive variable 'PYTHON_KEEP_PY_FILES' references itself (eventually). Stop.
As a workaround, rename the global variable to KEEP_PYTHON_PY_FILES so it
cannot conflict with the per-package variable.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 0f5ac40374c91e44af8c3806e848f8e62c42b140)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/pkg-generic.mk | 2 | ||||
| -rw-r--r-- | package/python/python.mk | 2 | ||||
| -rw-r--r-- | package/python3/python3.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0a3c721c9f..f9742014d3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -1059,7 +1059,7 @@ PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) -PYTHON_KEEP_PY_FILES += $$($(2)_KEEP_PY_FILES) +KEEP_PYTHON_PY_FILES += $$($(2)_KEEP_PY_FILES) ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/python/python.mk b/package/python/python.mk index 3f9c510fde..29b9e363b1 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -263,7 +263,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) define PYTHON_REMOVE_PY_FILES find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(PYTHON_KEEP_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(PYTHON_KEEP_PY_FILES)) \) ) \ + $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -print0 | \ xargs -0 --no-run-if-empty rm -f endef diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f634b790ef..625c059135 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -281,7 +281,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) define PYTHON3_REMOVE_PY_FILES find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' \ - $(if $(strip $(PYTHON_KEEP_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(PYTHON_KEEP_PY_FILES)) \) ) \ + $(if $(strip $(KEEP_PYTHON_PY_FILES)),-not \( $(call finddirclauses,$(TARGET_DIR),$(KEEP_PYTHON_PY_FILES)) \) ) \ -print0 | \ xargs -0 --no-run-if-empty rm -f endef |