diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-04-16 22:12:35 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-04-18 15:41:15 +0200 |
| commit | 9bb0af1ae597967aca35e09d332bc9d36ec5899c (patch) | |
| tree | 8d5ec873005f5d7f68d565a38a12e80a3b3f4387 | |
| parent | 6aff21da187445b2e99863713f810de6abdec0a0 (diff) | |
| download | buildroot-9bb0af1ae597967aca35e09d332bc9d36ec5899c.tar.gz buildroot-9bb0af1ae597967aca35e09d332bc9d36ec5899c.zip | |
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>
| -rw-r--r-- | package/ffmpeg/0016-ranlib.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/ffmpeg/0016-ranlib.patch b/package/ffmpeg/0016-ranlib.patch new file mode 100644 index 0000000000..e88b25f1b4 --- /dev/null +++ b/package/ffmpeg/0016-ranlib.patch @@ -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 |
