From: Federico Capoano Date: Tue, 19 Mar 2024 13:52:31 +0000 (-0300) Subject: flashrom: strip leading whitespace from PROGRAMMER_ARGS X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=9f54d987476f74f91ec545d1036cdbcdf455b2a1;p=feed%2Fpackages.git flashrom: strip leading whitespace from PROGRAMMER_ARGS Newer version of meson do not allow empty arguments. Signed-off-by: Federico Capoano --- diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile index e75add75ed..cced9a846e 100644 --- a/utils/flashrom/Makefile +++ b/utils/flashrom/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=flashrom PKG_VERSION:=1.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.flashrom.org/releases diff --git a/utils/flashrom/flashrom.mk b/utils/flashrom/flashrom.mk index 5ee91a8f06..454e954436 100644 --- a/utils/flashrom/flashrom.mk +++ b/utils/flashrom/flashrom.mk @@ -96,9 +96,8 @@ else $(eval $(call Programmer,satamv,$(FLASHROM_PCI))) endif -comma := , MESON_ARGS += \ -Ddefault_programmer_name=$(DEFAULT_PROGRAMMER_NAME) \ - -Dprogrammer=$(subst $() $(),$(comma),$(PROGRAMMER_ARGS)) \ + -Dprogrammer=$(subst $(space),$(comma),$(strip $(PROGRAMMER_ARGS))) \ -Dwerror=false \ -Dtests=disabled