* [Buildroot] [git commit] package/rpm: introduce rpm2archive option
@ 2021-09-11 20:33 Arnout Vandecappelle
0 siblings, 0 replies; only message in thread
From: Arnout Vandecappelle @ 2021-09-11 20:33 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=4c5e3896ef55d48905074eb15a238e3393341112
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 <james.d.knight@live.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
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' \
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-11 20:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-11 20:33 [Buildroot] [git commit] package/rpm: introduce rpm2archive option Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.