From 4c5e3896ef55d48905074eb15a238e3393341112 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 4 Sep 2021 16:40:25 -0400 Subject: [PATCH] package/rpm: introduce rpm2archive option Adjust the inclusion of the rpm2archive command as an option, to allow a developer to opt-out of building/including the command if it is not desired/needed for the target. Signed-off-by: James Knight Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rpm/Config.in | 15 +++++++++++++++ package/rpm/rpm.mk | 14 +++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/package/rpm/Config.in b/package/rpm/Config.in index 9da8d51df0..2af04b41b4 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -19,3 +19,18 @@ config BR2_PACKAGE_RPM The RPM Package Manager (RPM). http://www.rpm.org/ + +if BR2_PACKAGE_RPM + +comment "rpm2archive support needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + +config BR2_PACKAGE_RPM_RPM2ARCHIVE + bool "rpm2archive command" + default y + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBARCHIVE + help + Enable rpm2archive + +endif diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index e9d2adf690..5c04d47f10 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -73,13 +73,6 @@ else RPM_CONF_OPTS += --without-libintl-prefix endif -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -RPM_DEPENDENCIES += libarchive -RPM_CONF_OPTS += --with-archive -else -RPM_CONF_OPTS += --without-archive -endif - ifeq ($(BR2_PACKAGE_LIBSELINUX),y) RPM_DEPENDENCIES += libselinux RPM_CONF_OPTS += --with-selinux @@ -101,6 +94,13 @@ else RPM_CONF_OPTS += --disable-zstd endif +ifeq ($(BR2_PACKAGE_RPM_RPM2ARCHIVE),y) +RPM_DEPENDENCIES += libarchive +RPM_CONF_OPTS += --with-archive +else +RPM_CONF_OPTS += --without-archive +endif + # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ -- 2.30.2