From: Michael Smith <msmith@cbnco.com>
Date: Wed, 10 Nov 2010 18:34:04 +0000 (-0500)
Subject: smpeg: configure with --disable-rpath
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c41577edaa26a7f09c1727dcc2c9f2758e2deff;p=openembedded.git

smpeg: configure with --disable-rpath

Otherwise libtool and ld try to link against ${libdir}/libdl.so.2 on the
host system.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---

diff --git a/recipes/smpeg/smpeg-0.4.5+svnr387/add-disable-rpath.patch b/recipes/smpeg/smpeg-0.4.5+svnr387/add-disable-rpath.patch
new file mode 100644
index 0000000000..e1de0ea1e8
--- /dev/null
+++ b/recipes/smpeg/smpeg-0.4.5+svnr387/add-disable-rpath.patch
@@ -0,0 +1,47 @@
+Upstream: http://icculus.org/pipermail/smpeg/2010-November/000183.html
+
+Add --disable-rpath to fix build in OE.
+
+--- trunk/configure.in.orig	2010-11-07 09:00:19.000000000 -0500
++++ trunk/configure.in	2010-11-10 13:02:06.000000000 -0500
+@@ -84,19 +84,27 @@
+         ;;
+ esac
+ 
+-# Set runtime shared library paths as needed 
+-
+-case "$target" in
+-    *-*-linux*)
+-	SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+-	;;
+-    *-*-freebsd*)
+-	SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
+-	;;
+-    *-*-solaris*)
+-	SMPEG_RLD_FLAGS="-R\${exec_prefix}/lib"
+-	;;
+-esac
++dnl Set runtime shared library paths as needed 
++AC_ARG_ENABLE(rpath,
++	AC_HELP_STRING([--enable-rpath],
++		[use an rpath when linking SDL [[default=yes]]]),,
++	enable_rpath=yes)
++
++if test "x$enable_rpath" = "xyes"; then
++  case "$target" in
++      *-*-linux*)
++	  SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
++	  ;;
++      *-*-freebsd*)
++	  SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
++	  ;;
++      *-*-solaris*)
++	  SMPEG_RLD_FLAGS="-R\${exec_prefix}/lib"
++	  ;;
++  esac
++else
++  SMPEG_RLD_FLAGS=""
++fi
+ 
+ AC_SUBST(SMPEG_RLD_FLAGS)
+ 
diff --git a/recipes/smpeg/smpeg_svn.bb b/recipes/smpeg/smpeg_svn.bb
index 394270d711..8213877f92 100644
--- a/recipes/smpeg/smpeg_svn.bb
+++ b/recipes/smpeg/smpeg_svn.bb
@@ -7,15 +7,17 @@ PROVIDES = "smpeg"
 PV = "0.4.5+svnr${SRCPV}"
 PE = "2"
 SRCREV = "387"
+PR = "r1"
 
-SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk"
+SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk \
+	file://add-disable-rpath.patch"
 
 S = "${WORKDIR}/trunk"
 
 inherit autotools binconfig
 
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
-		--without-gtk --disable-gtk-player"
+		--without-gtk --disable-gtk-player --disable-rpath"
 
 do_configure_prepend () {
 	touch NEWS AUTHORS ChangeLog