pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pulseaudio dynamic linking for Solaris builds.

Browse source 
Don't link to unnecessary filter libraries for pthread and rt on Solaris.

--HG--
branch : SDL-1.2
This commit is contained in:
Shawn Walker 2013-02-19 22:05:52 +00:00
parent d54926cd09
commit 770d169563
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
configure.in
View file

@ -553,6 +553,14 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor
test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
echo "-- dynamic libpulse-simple -> $pulse_lib" echo "-- dynamic libpulse-simple -> $pulse_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib") AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
case "$host" in
# On Solaris, pulseaudio must be linked deferred explicitly
# to prevent undefined symbol failures.
*-*-solaris*)
PULSE_LIBS=`echo $PULSE_LIBS | sed 's/\-l/-Wl,-l/g'`
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-zdeferred $PULSE_LIBS -Wl,-znodeferred"
esac
else else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS" EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"
fi fi
@ -1918,9 +1926,20 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
pthread_cflags="-D_REENTRANT" pthread_cflags="-D_REENTRANT"
pthread_lib="-pthread" pthread_lib="-pthread"
;; ;;
*-*-solaris*) *-*-solaris2.9)
# From Solaris 9+, posix4's preferred name is rt.
pthread_cflags="-D_REENTRANT" pthread_cflags="-D_REENTRANT"
pthread_lib="-lpthread -lposix4" pthread_lib="-lpthread -lrt"
;;
*-*-solaris2.10)
# Solaris 10+ merged pthread into libc.
pthread_cflags="-D_REENTRANT"
pthread_lib="-lrt"
;;
*-*-solaris*)
# Solaris 11+ merged rt into libc.
pthread_cflags="-D_REENTRANT"
pthread_lib=""
;; ;;
*-*-sysv5*) *-*-sysv5*)
pthread_cflags="-D_REENTRANT -Kthread" pthread_cflags="-D_REENTRANT -Kthread"