diff options
| author | maya <maya@pkgsrc.org> | 2018-12-30 14:47:04 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-12-30 14:47:04 +0000 |
| commit | bc14e816f3d85d8348e40a876d919a14925b9d46 (patch) | |
| tree | 5a6ecd4eb6d900e79dad395eea27c07e88d92c03 /devel/SDL2/patches | |
| parent | e634550bada6acf5044a3e9e21d64870534f0752 (diff) | |
| download | pkgsrc-bc14e816f3d85d8348e40a876d919a14925b9d46.tar.gz | |
SDL2: make sdl2-config DTRT if the X11 libraries are not in ${PREFIX}/lib
Because SDL2 uses dlopen for these libraries, it's hard to tell what
is failing.
Example test case in http://daemonforums.org/showthread.php?t=10360
reported by oliv3 on IRC, thanks!
Diffstat (limited to 'devel/SDL2/patches')
| -rw-r--r-- | devel/SDL2/patches/patch-configure | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/devel/SDL2/patches/patch-configure b/devel/SDL2/patches/patch-configure index 7181b1e74dc..0b0c2089dae 100644 --- a/devel/SDL2/patches/patch-configure +++ b/devel/SDL2/patches/patch-configure @@ -1,10 +1,22 @@ -$NetBSD: patch-configure,v 1.6 2017/01/26 03:46:20 nat Exp $ +$NetBSD: patch-configure,v 1.7 2018/12/30 14:47:04 maya Exp $ Adding --enable-new-dtags breaks sdl2-config on NetBSD. +Allow overriding SDL_RLD_FLAGS so we can add /usr/X11R7/lib. ---- configure.orig 2016-10-20 03:56:27.000000000 +0000 +--- configure.orig 2018-10-31 15:07:22.000000000 +0000 +++ configure -@@ -23955,7 +23955,7 @@ _ACEOF +@@ -24937,7 +24937,9 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" + + if test "x$enable_rpath" = "xyes"; then + if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then +- SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" ++ if test -n $SDL_RLD_FLAGS; then ++ SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" ++ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker option --enable-new-dtags" >&5 + $as_echo_n "checking for linker option --enable-new-dtags... " >&6; } +@@ -24960,7 +24962,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : have_enable_new_dtags=yes |