From 21a56f9edbca8dd8b19567be6be2b32e44ebb860 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 8 Oct 2021 17:27:26 -0700 Subject: [PATCH] package/python3: Add bzip2 option to host The bzip2 module is needed to build the host variant of NodeJS 14. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python3/Config.in | 1 - package/python3/Config.in.host | 6 ++++++ package/python3/python3.mk | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index efc4dbb3d4..18b6d6367b 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -54,7 +54,6 @@ config BR2_PACKAGE_PYTHON3_BERKELEYDB config BR2_PACKAGE_PYTHON3_BZIP2 bool "bz2 module" - select BR2_PACKAGE_BZIP2 help bzip2 module for Python3 diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 70b5dacdde..65a8df0754 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -7,6 +7,12 @@ config BR2_PACKAGE_HOST_PYTHON3 if BR2_PACKAGE_HOST_PYTHON3 +config BR2_PACKAGE_HOST_PYTHON3_BZIP2 + bool "bzip2" + select BR2_PACKAGE_HOST_BZIP2 + help + bz2 module for host Python3. + config BR2_PACKAGE_HOST_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_HOST_OPENSSL diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 3e88bc0ff4..779f6dcb6c 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -43,6 +43,12 @@ PYTHON3_DEPENDENCIES = host-python3 libffi HOST_PYTHON3_DEPENDENCIES = host-autoconf-archive host-expat host-zlib host-libffi +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_BZIP2),y) +HOST_PYTHON3_DEPENDENCIES += host-bzip2 +else +HOST_PYTHON3_CONF_OPTS += --disable-bzip2 +endif + ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl else