All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] sdl: use <pkg>_CONFIG_SCRIPTS for sdl-config
@ 2013-03-18  8:46 Peter Korsgaard
  0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2013-03-18  8:46 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=95da46dfd6536a13768ef029a97c14de6805a947
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Use the <pkg>_CONFIG_SCRIPTS mechanism to handle the sdl-config
script, so that it properly gets removed from the target. However, we
can't completely remove the manual fixup, because it also takes care
of removing the -Wl,-rpath option, which the general
<pkg>_CONFIG_SCRIPTS doesn't do.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sdl/sdl.mk |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 4786dc5..fb47c4d 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -57,13 +57,10 @@ SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-nasm \
 		--disable-video-ps3
 
-# Fixup prefix= and exec_prefix= in sdl-config, and remove the
-# -Wl,-rpath option.
+SDL_CONFIG_SCRIPTS = sdl-config
+
+# Remove the -Wl,-rpath option.
 define SDL_FIXUP_SDL_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
-	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
 	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
 		$(STAGING_DIR)/usr/bin/sdl-config
 endef

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-03-18  8:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-18  8:46 [Buildroot] [git commit] sdl: use <pkg>_CONFIG_SCRIPTS for sdl-config Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.