Sun Dec 30 14:47:04 2018 UTC ()
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!


(maya)
diff -r1.33 -r1.34 pkgsrc/devel/SDL2/Makefile
diff -r1.31 -r1.32 pkgsrc/devel/SDL2/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/SDL2/patches/patch-configure
cvs diff -r1.33 -r1.34 pkgsrc/devel/SDL2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/SDL2/Makefile 2018/12/23 14:27:15 1.33
+++ pkgsrc/devel/SDL2/Makefile 2018/12/30 14:47:04 1.34
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1# $NetBSD: Makefile,v 1.33 2018/12/23 14:27:15 nia Exp $ 1# $NetBSD: Makefile,v 1.34 2018/12/30 14:47:04 maya Exp $
2 2
3DISTNAME= SDL2-2.0.9 3DISTNAME= SDL2-2.0.9
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.libsdl.org/release/ 6MASTER_SITES= http://www.libsdl.org/release/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.libsdl.org/ 9HOMEPAGE= http://www.libsdl.org/
10COMMENT= Simple DirectMedia Layer is a cross-platform multimedia library 10COMMENT= Simple DirectMedia Layer is a cross-platform multimedia library
11LICENSE= zlib 11LICENSE= zlib
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config autoconf automake autoreconf 15USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17PKGCONFIG_OVERRIDE+= sdl2.pc.in 17PKGCONFIG_OVERRIDE+= sdl2.pc.in
18 18
 19CONFIGURE_ENV+= SDL_RLD_FLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib \
 20 ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
 21
19CHECK_PORTABILITY_SKIP+=build-scripts/androidbuildlibs.sh 22CHECK_PORTABILITY_SKIP+=build-scripts/androidbuildlibs.sh
20CHECK_PORTABILITY_SKIP+=build-scripts/iosbuild.sh 23CHECK_PORTABILITY_SKIP+=build-scripts/iosbuild.sh
21 24
22.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
23 26
24.if ${OPSYS} != "Linux" 27.if ${OPSYS} != "Linux"
25BUILDLINK_TRANSFORM+= rm:-ldl 28BUILDLINK_TRANSFORM+= rm:-ldl
26.endif 29.endif
27 30
28CFLAGS+= -DPREFIX=\"${PREFIX}\" 31CFLAGS+= -DPREFIX=\"${PREFIX}\"
29 32
30.include "options.mk" 33.include "options.mk"
31 34
cvs diff -r1.31 -r1.32 pkgsrc/devel/SDL2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/SDL2/distinfo 2018/12/05 10:46:15 1.31
+++ pkgsrc/devel/SDL2/distinfo 2018/12/30 14:47:04 1.32
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.31 2018/12/05 10:46:15 bsiegert Exp $ 1$NetBSD: distinfo,v 1.32 2018/12/30 14:47:04 maya Exp $
2 2
3SHA1 (SDL2-2.0.9.tar.gz) = 4354c6baad9a48486182656a7506abfb63e9bff5 3SHA1 (SDL2-2.0.9.tar.gz) = 4354c6baad9a48486182656a7506abfb63e9bff5
4RMD160 (SDL2-2.0.9.tar.gz) = db2efabf55af41cddf015db0b5213b11ef22b9d0 4RMD160 (SDL2-2.0.9.tar.gz) = db2efabf55af41cddf015db0b5213b11ef22b9d0
5SHA512 (SDL2-2.0.9.tar.gz) = a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10 5SHA512 (SDL2-2.0.9.tar.gz) = a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
6Size (SDL2-2.0.9.tar.gz) = 5246942 bytes 6Size (SDL2-2.0.9.tar.gz) = 5246942 bytes
7SHA1 (patch-configure) = 5637a66f8890586026034f5324829e61c94ac5be 7SHA1 (patch-configure) = 1631314dab18886ea553ee53fac89e16718cacab
8SHA1 (patch-src_audio_netbsd_SDL__netbsdaudio.c) = 7a1f32ea7029f8dc99aecfaead7c68f2fd6cb230 8SHA1 (patch-src_audio_netbsd_SDL__netbsdaudio.c) = 7a1f32ea7029f8dc99aecfaead7c68f2fd6cb230
9SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 152b5df76a91c7e7acde126b1464fdd464cf1ba2 9SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 152b5df76a91c7e7acde126b1464fdd464cf1ba2
10SHA1 (patch-src_video_cocoa_SDL__cocoawindow.m) = 1d5ac9c17ceadf668925734b5cad311e26f2fc58 10SHA1 (patch-src_video_cocoa_SDL__cocoawindow.m) = 1d5ac9c17ceadf668925734b5cad311e26f2fc58
11SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0 11SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0
cvs diff -r1.6 -r1.7 pkgsrc/devel/SDL2/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/devel/SDL2/patches/Attic/patch-configure 2017/01/26 03:46:20 1.6
+++ pkgsrc/devel/SDL2/patches/Attic/patch-configure 2018/12/30 14:47:04 1.7
@@ -1,15 +1,27 @@ @@ -1,15 +1,27 @@
1$NetBSD: patch-configure,v 1.6 2017/01/26 03:46:20 nat Exp $ 1$NetBSD: patch-configure,v 1.7 2018/12/30 14:47:04 maya Exp $
2 2
3Adding --enable-new-dtags breaks sdl2-config on NetBSD. 3Adding --enable-new-dtags breaks sdl2-config on NetBSD.
 4Allow overriding SDL_RLD_FLAGS so we can add /usr/X11R7/lib.
4 5
5--- configure.orig 2016-10-20 03:56:27.000000000 +0000 6--- configure.orig 2018-10-31 15:07:22.000000000 +0000
6+++ configure 7+++ configure
7@@ -23955,7 +23955,7 @@ _ACEOF 8@@ -24937,7 +24937,9 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS"
 9
 10 if test "x$enable_rpath" = "xyes"; then
 11 if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
 12- SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
 13+ if test -n $SDL_RLD_FLAGS; then
 14+ SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
 15+ fi
 16
 17 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker option --enable-new-dtags" >&5
 18 $as_echo_n "checking for linker option --enable-new-dtags... " >&6; }
 19@@ -24960,7 +24962,7 @@ _ACEOF
8 if ac_fn_c_try_link "$LINENO"; then : 20 if ac_fn_c_try_link "$LINENO"; then :
9  21
10 have_enable_new_dtags=yes 22 have_enable_new_dtags=yes
11- SDL_RLD_FLAGS="$SDL_RLD_FLAGS -Wl,--enable-new-dtags" 23- SDL_RLD_FLAGS="$SDL_RLD_FLAGS -Wl,--enable-new-dtags"
12+ SDL_RLD_FLAGS="$SDL_RLD_FLAGS" 24+ SDL_RLD_FLAGS="$SDL_RLD_FLAGS"
13  25
14 fi 26 fi
15 rm -f core conftest.err conftest.$ac_objext \ 27 rm -f core conftest.err conftest.$ac_objext \