Skip to contentSkip to conversation

package/sdl2: Fix sdl2-config.cmake

PATCH In review Gleb Mazovetskiy 2 participants 2 messages Jul 1, 2021 – Jul 29, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/sdl2: Fix sdl2-config.cmake

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.

---
 package/sdl2/sdl2.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
package/sdl2/sdl2.mk +5 -5
index a2e426e578..68a6e1abca 100644
@@ -24,13 +24,13 @@ 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) '2s|^|get_filename_component(PACKAGE_PREFIX_DIR "$${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)\n|; 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
Signature · 1 line
2.30.2
#1 lore raw
Quoted 9 lines · On Thu, 1 Jul 2021 07:24:32 +0100 Gleb Mazovetskiy <[email protected]> wrote:

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.

---
 package/sdl2/sdl2.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

I have applied, after slightly reworking how the SED replacement is done. I'm using the "i" sed command to insert the line, and then do the "s" replacement separately.

Yes, it requires two sed invocations, but I found it to be a bit clearer.

Thanks for your contribution!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot