NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdl: disable rpath via configure option

Browse Source 
The -rpath option was being stripped from sdl-config via a post install
staging hook, but the same wasn't being done for sdl.pc. Because of
this, packages that detect SDL via pkg-config ended up passing
'-Wl,-rpath,/usr/lib' to the linker, which caused build failures under
certain circumstances since libraries were being looked for in the wrong
directory.

Fix by passing the --disable-rpath option to the SDL configure script,
which takes care of disabling -rpath everywhere. This also allows the
SDL_FIXUP_SDL_CONFIG hack to be completely removed.

Fixes:

  http://autobuild.buildroot.net/results/624/62499217eeaf3228b46652e3f65776d7ece8fce6/
  http://autobuild.buildroot.net/results/cc1/cc1f78f6c43e3a7bf3ed80d759d9c4d7363d0e48/

Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Rodrigo Rebello 2016-03-17 03:02:22 -03:00 committed by Peter Korsgaard
parent c9d87e7347
commit 2f259304b9
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/sdl/sdl.mk
View File

@ -80,6 +80,7 @@ SDL_DEPENDENCIES += mesa3d
endif
SDL_CONF_OPTS += \
--disable-rpath \
--enable-pulseaudio=no \
--disable-arts \
--disable-esd \
@ -96,13 +97,5 @@ HOST_SDL_CONF_OPTS += \
SDL_CONFIG_SCRIPTS = sdl-config
# Remove the -Wl,-rpath option.
define SDL_FIXUP_SDL_CONFIG
$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
$(STAGING_DIR)/usr/bin/sdl-config
endef
SDL_POST_INSTALL_STAGING_HOOKS += SDL_FIXUP_SDL_CONFIG
$(eval $(autotools-package))
$(eval $(host-autotools-package))