package/rpm: drop binutils optional dependency
PATCH 1/1 package/rpm: drop binutils optional dependency
Since bump to version 4.14.2.1, binutils is not an optional dependency anymore as bfd.h has been droped in 4.14.0 with
https://github.com/rpm-software-management/rpm/commit/245b5a3b4b6d616adf47361137987e90f8dab22c
So drop it and manage optional elfutils dependency through a single line (and drop binutils/elfutils comment)
--- package/rpm/rpm.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
package/rpm/rpm.mk +1 -10
@@ -12,6 +12,7 @@ RPM_DEPENDENCIES = \ host-pkgconf \ berkeleydb \ $(if $(BR2_PACKAGE_BZIP2),bzip2) \ + $(if $(BR2_PACKAGE_ELFUTILS),elfutils) \ file \ popt \ $(if $(BR2_PACKAGE_XZ),xz) \
@@ -82,16 +83,6 @@ else RPM_CONF_OPTS += --without-selinux endif -# For the elfutils and binutils dependencies, there are no -# configuration options to explicitly enable/disable them. -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -RPM_DEPENDENCIES += elfutils -endif - -ifeq ($(BR2_PACKAGE_BINUTILS),y) -RPM_DEPENDENCIES += binutils -endif - ifeq ($(BR2_PACKAGE_ZSTD),y) RPM_DEPENDENCIES += zstd RPM_CONF_OPTS += --enable-zstd
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/rpm: drop binutils optional dependency
Quoted 11 lines · On Sun, 31 Mar 2019 16:49:34 +0200 Fabrice Fontaine…
Since bump to version 4.14.2.1, binutils is not an optional dependency anymore as
bfd.hhas been droped in 4.14.0 with
https://github.com/rpm-software-management/rpm/commit/245b5a3b4b6d616adf47361137987e90f8dab22cSo drop it and manage optional elfutils dependency through a single line (and drop binutils/elfutils comment)
Signed-off-by Fabrice Fontaine <[email protected]>--- package/rpm/rpm.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com