Skip to contentSkip to conversation

package/flashrom: fix cli with BR2_SHARED_LIBS

PATCH Applied James Hilliard 2 participants 2 messages Aug 19, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
Changes v1 -> v2:
- add some additional details

---
 package/flashrom/flashrom.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
package/flashrom/flashrom.mk +3 -4
index 1e7d332dae..030f6816a0 100644
@@ -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))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 8 lines · On Mon, 19 Aug 2024 02:43:52 -0600 James Hilliard <[email protected]>…

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.

Quoted 7 lines

---
Changes v1 -> v2:
- add some additional details

---
 package/flashrom/flashrom.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot