From be8b42242bfb1a702287cba36ab9f98ca7f2865e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 Nov 2021 14:28:13 +0100 Subject: [PATCH] package/kodi-*: run pkg-config at build time, not at parse time When calling 'printvars' on a just-configured tree, the output contains many spurious warnings about pkg-config being not found: make[1]: [...]/host/bin/pkg-config: Command not found This is partly because a few packages call pkg-config at the time the Makefile is parsed (really, right when make evaluates the recipe before executing it). It is customary, instead, to defer the call to pkg-config to the actual shell running the recipe's commands, like all our other packages do. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 22fb4c469bcb5b61beadfc78c27e403656eae979) Signed-off-by: Peter Korsgaard --- .../kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk | 4 ++-- package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk | 4 ++-- .../kodi-screensaver-matrixtrails.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index 9e768fce85..16a1dca261 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -11,7 +11,7 @@ KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = glm kodi KODI_SCREENSAVER_ASTERWAVE_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 628f254a42..6e04aa064e 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -11,7 +11,7 @@ KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = glm kodi KODI_SCREENSAVER_CPBLOBS_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" $(eval $(cmake-package)) diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index a89ea72d5d..2c091c8adc 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -11,7 +11,7 @@ KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi KODI_SCREENSAVER_MATRIXTRAILS_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" $(eval $(cmake-package))