From: Gleb Mazovetskiy Date: Thu, 1 Jul 2021 06:24:32 +0000 (+0100) Subject: package/sdl2: fix sdl2-config.cmake instead of removing it X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb46522f3ef1f2efc5785e6151c290af78f837f2;p=buildroot.git package/sdl2: fix sdl2-config.cmake instead of removing it SDL2 autotools-provided sdl2-config.cmake uses the absolute /usr prefix. For this reason, we previously removed it (as of d59261836a). This commit fixes sdl2-config.cmake to use relative paths instead. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Thomas Petazzoni --- diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index a2e426e578..5aad92eda8 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -24,13 +24,15 @@ SDL2_CONF_OPTS += \ # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. -# Remove sdl2-config.cmake file and avoid unsafe include path if this -# file is used by a cmake based package. +# Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. # https://bugzilla.libsdl.org/show_bug.cgi?id=4597 -define SDL2_REMOVE_SDL2_CONFIG_CMAKE - rm -rf $(STAGING_DIR)/usr/lib/cmake/SDL2 +define SDL2_FIX_SDL2_CONFIG_CMAKE + $(SED) '2iget_filename_component(PACKAGE_PREFIX_DIR "$${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)\n' \ + $(STAGING_DIR)/usr/lib/cmake/SDL2/sdl2-config.cmake + $(SED) 's%"/usr"%$${PACKAGE_PREFIX_DIR}%' \ + $(STAGING_DIR)/usr/lib/cmake/SDL2/sdl2-config.cmake endef -SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_REMOVE_SDL2_CONFIG_CMAKE +SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static