Fix pulseaudio dynamic linking for Solaris builds.

Fix Solaris Studio compilation errors. Fix sunaudio backend for SDL2.
libsdl-org · Feb 25, 2013 · 6c6393c4865fce2a4b03952128db6eb22c9579a4 · 6c6393c
1 parent 9cb578a
commit 6c6393c4865fce2a4b03952128db6eb22c9579a4
Unified Split

Showing with 154 additions and 183 deletions.

+8 −0 configure.in

+135 −158 src/audio/sun/SDL_sunaudio.c

+0 −10 src/audio/sun/SDL_sunaudio.h

+6 −6 src/video/SDL_blit_0.c

+5 −5 src/video/SDL_blit_1.c

+0 −4 src/video/x11/edid.h
diff --git a/configure.in b/configure.in
@@ -794,6 +794,14 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor
                test x$enable_pulseaudio_shared = xyes && test x$pulseaudio_lib != x; then
                 echo "-- dynamic libpulse-simple -> $pulseaudio_lib"
                 AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC, "$pulseaudio_lib", [ ])
+
+                case "$host" in
+                    # On Solaris, pulseaudio must be linked deferred explicitly
+                    # to prevent undefined symbol failures.
+                    *-*-solaris*)
+                        PULSEAUDIO_LIBS=`echo $PULSEAUDIO_LIBS | sed 's/\-l/-Wl,-l/g'`
+                        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-zdeferred $PULSEAUDIO_LIBS -Wl,-znodeferred"
+                esac
             else
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSEAUDIO_LIBS"
             fi