summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-07-22 11:24:30 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-07-22 11:24:30 +0200
commit89fc8a4f5a900ce493c4aabb29bbd6186f27ebf8 (patch)
treec8a1fb847c5569c2fdae16fad0a3ba90b66eb6d3
parent32d319e6f7242553c821c7a1eadfabd2719f5992 (diff)
mplayer: fix build after efb1d8d3f40 (Cleanup TARGET_CONFIGURE_OPTS)
mplayer's configure script got confused by the equal sign (=) we now have in TARGET_CC because of --sysroot=<path>. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES8
-rw-r--r--package/multimedia/mplayer/mplayer-1.0rc2-fix-cc-parsing.patch22
2 files changed, 26 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index f6388c5ee..381141a50 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,10 +21,10 @@
gst-plugins-base, gstreamer, gzip, intltool, ipsec-tools,
iptables, libart, libcgi, libdrm, libfuse, libgpg-error,
libidn, liblockfile, libpng, lighttpd, links, linux-fusion,
- lmbench, lrzsz, ltrace, make, module-init-tools, mysql_client,
- nbd, ncurses, neon, netcat, netperf, ntfsprogs, openssl, php,
- qt, quagga, sqlite, sdl, sdl_mixer, sdl_sound, sdl_ttf,
- squashfs, tn5250, tremor, usbutils, xkeyboard-config,
+ lmbench, lrzsz, ltrace, make, module-init-tools, mplayer,
+ mysql_client, nbd, ncurses, neon, netcat, netperf, ntfsprogs,
+ openssl, php, qt, quagga, sqlite, sdl, sdl_mixer, sdl_sound,
+ sdl_ttf, squashfs, tn5250, tremor, usbutils, xkeyboard-config,
xserver_xorg-server, xvkbd
Removed packages: modutils, portage, rxvt
diff --git a/package/multimedia/mplayer/mplayer-1.0rc2-fix-cc-parsing.patch b/package/multimedia/mplayer/mplayer-1.0rc2-fix-cc-parsing.patch
new file mode 100644
index 000000000..770e145f1
--- /dev/null
+++ b/package/multimedia/mplayer/mplayer-1.0rc2-fix-cc-parsing.patch
@@ -0,0 +1,22 @@
+[PATCH] mplayer: fix --cc= parsing if the value contains equal signs (=)
+
+E.G. if -cc="$CROSS-gcc --sysroot=<SYSROOT>" is passed.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: MPlayer-1.0rc2/configure
+===================================================================
+--- MPlayer-1.0rc2.orig/configure
++++ MPlayer-1.0rc2/configure
+@@ -761,7 +761,7 @@ for ac_option do
+ _target=`echo $ac_option | cut -d '=' -f 2`
+ ;;
+ --cc=*)
+- _cc=`echo $ac_option | cut -d '=' -f 2`
++ _cc=`echo $ac_option | cut -d '=' -f 2-`
+ ;;
+ --host-cc=*)
+ _host_cc=`echo $ac_option | cut -d '=' -f 2`