package/ffmpeg: Fix ranlib check when cross-compiling

Fixes
http://autobuild.buildroot.net/results/d13/d13488a43f6e034623104a36c07114db99325b8d/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2015-04-16 22:12:35 +02:00 committed by Thomas Petazzoni
parent 6aff21da18
commit 9bb0af1ae5

View File

@ -0,0 +1,35 @@
Fix ranlib check when cross-compiling
Without this patch /usr/bin/ranlib is tested for "-D", not ranlib from the
cross-compiler suite being in use.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -uNr ffmpeg-2.6.2.org/configure ffmpeg-2.6.2/configure
--- ffmpeg-2.6.2.org/configure 2015-04-12 00:47:55.000000000 +0200
+++ ffmpeg-2.6.2/configure 2015-04-16 21:53:24.313202517 +0200
@@ -2719,11 +2719,6 @@
nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
-if ranlib 2>&1 | grep -q "\-D "; then
- ranlib_default="ranlib -D"
-else
- ranlib_default="ranlib"
-fi
strip_default="strip"
yasmexe_default="yasm"
windres_default="windres"
@@ -3001,6 +2996,12 @@
die "Must specify target arch and OS when cross-compiling"
fi
+if "${cross_prefix}ranlib" 2>&1 | grep -q "\-D "; then
+ ranlib_default="ranlib -D"
+else
+ ranlib_default="ranlib"
+fi
+
test -n "$valgrind" && toolchain="valgrind-memcheck"
case "$toolchain" in