| Message ID | 20211109165908.1942790-1-yann.morin.1998@free.fr |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [1/2] package/kodi-*: run pkg-config at build time, not at parse time | expand |
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > 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 <yann.morin.1998@free.fr> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Committed to 2021.08.x, thanks.
diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index b78646b9a9..21def8ca4c 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 c6dd26a89b..6f462e7d27 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 ac4303a719..45d3e46b4a 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))
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 <yann.morin.1998@free.fr> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../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(-)