From 9f54d987476f74f91ec545d1036cdbcdf455b2a1 Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Tue, 19 Mar 2024 10:52:31 -0300 Subject: [PATCH] flashrom: strip leading whitespace from PROGRAMMER_ARGS Newer version of meson do not allow empty arguments. Signed-off-by: Federico Capoano --- utils/flashrom/Makefile | 2 +- utils/flashrom/flashrom.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 -- 2.30.2