From a7fe8c88d1d01ed59cdd477b87e26213d1ed9c21 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 19 Aug 2024 02:43:52 -0600 Subject: [PATCH] package/flashrom: fix cli with BR2_SHARED_LIBS Flashrom requires --default-library=both for the cli when building with BR2_SHARED_LIBS. As such set --default-library=both instead of disabling it. The cli was disabled in 8637884057ddc3c1aeb9f0dd285fc6fcf378c26b to work around a cli build issue which this fixes. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/flashrom/flashrom.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 1e7d332dae..030f6816a0 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -10,6 +10,7 @@ FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING FLASHROM_INSTALL_STAGING = YES FLASHROM_CONF_OPTS = \ + -Dclassic_cli=enabled \ -Dclassic_cli_print_wiki=disabled \ -Dich_descriptors_tool=enabled \ -Dtests=disabled \ @@ -78,10 +79,8 @@ endif FLASHROM_CONF_OPTS += -Dprogrammer=$(subst $(space),$(comma),$(strip $(FLASHROM_PROGRAMMERS))) -ifeq ($(BR2_SHARED_LIBS),) -FLASHROM_CONF_OPTS += -Dclassic_cli=enabled -else -FLASHROM_CONF_OPTS += -Dclassic_cli=disabled +ifeq ($(BR2_SHARED_LIBS),y) +FLASHROM_CONF_OPTS += --default-library=both endif $(eval $(meson-package))