Fix dlvsym check so it works and doesnt break uClibc/etc... #105160.

(Portage version: 2.0.51.22-r2)

4 files changed, 36 insertions, 3 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 68ecf1a7ce3f..2b5dc0667455 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.86 2005/08/28 22:10:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.87 2005/09/07 23:19:40 vapier Exp $
+
+  07 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.9-dlvsym-check.patch, libsdl-1.2.8-r1.ebuild,
+  libsdl-1.2.9.ebuild:
+  Fix dlvsym check so it works and doesnt break uClibc/etc... #105160.
 
 *libsdl-1.2.9 (28 Aug 2005)
 
diff --git a/media-libs/libsdl/files/libsdl-1.2.9-dlvsym-check.patch b/media-libs/libsdl/files/libsdl-1.2.9-dlvsym-check.patch
new file mode 100644
index 000000000000..95ed1d40469e
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.9-dlvsym-check.patch
@@ -0,0 +1,26 @@
+simply trying a compile to see if a func exists is not enough
+
+check to see if the dlvsym func exists in the dl library instead
+
+--- configure.in
++++ configure.in
+@@ -313,18 +313,8 @@ CheckALSA()
+                 CFLAGS="$CFLAGS -DALSA_SUPPORT -DALSA_DYNAMIC=\$(alsa_lib) $ALSA_CFLAGS"
+                 AC_SUBST(alsa_lib)
+ 
+-                AC_MSG_CHECKING(for dlvsym)
+                 use_dlvsym=no
+-                AC_TRY_COMPILE([
+-                  #include <stdio.h>
+-                  #define __USE_GNU
+-                  #include <dlfcn.h>
+-                ],[
+-                  dlvsym(NULL,"","");
+-                ],[
+-                use_dlvsym=yes
+-                ])
+-                AC_MSG_RESULT($use_dlvsym);
++                AC_CHECK_LIB(dl, dlvsym, [use_dlvsym=yes])
+                 if test x$use_dlvsym = xyes; then
+                     CFLAGS="$CFLAGS -DUSE_DLVSYM"
+                 fi
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
index 45a57d16fec0..9a2ebfbb8091 100644
--- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.19 2005/08/04 03:59:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.20 2005/09/07 23:19:40 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-gcc2.patch #75392
 	epatch "${FILESDIR}"/${P}-sdl-config.patch
 	epatch "${FILESDIR}"/${P}-no-cxx.patch
+	epatch "${FILESDIR}"/libsdl-1.2.9-dlvsym-check.patch #105160
 
 	# This patch breaks compiling >-O0 on gcc4 ; bug #87809
 	[ "`gcc-major-version`" -lt "4" ] && epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481
diff --git a/media-libs/libsdl/libsdl-1.2.9.ebuild b/media-libs/libsdl/libsdl-1.2.9.ebuild
index 4a7dda64e130..3db8bc34108a 100644
--- a/media-libs/libsdl/libsdl-1.2.9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.3 2005/09/04 18:20:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.4 2005/09/07 23:19:40 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -59,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/libsdl-1.2.8-libcaca.patch #40224
 	epatch "${FILESDIR}"/libsdl-1.2.8-sdl-config.patch
 	epatch "${FILESDIR}"/libsdl-1.2.8-no-cxx.patch
+	epatch "${FILESDIR}"/libsdl-1.2.9-dlvsym-check.patch #105160
 	epatch "${FILESDIR}"/1.2.8-gcc4.patch
 
 	./autogen.sh || die "autogen failed"