diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-04-19 21:45:38 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-04-19 21:45:38 +1000 |
| commit | 3a16fcd9dc273e4f5363408ad2d857e560e7966b (patch) | |
| tree | 3b19db1bb6b6b48fa1c541850ed1cb338b998b10 /tools/depends | |
| parent | 33a0c0f8ef8cc423c1015486d14f0df190314c97 (diff) | |
[android] fix building ffmpeg on osx host for android
ffmpeg build was using osx native tools for AR/RANLIB/STRIP via tools/depends build
internal build was missing RANLIB, and therefore getting the following warnings
warning: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib:
archive library: /Users/Shared/xbmc-depends/aarch64-linux-android-31-debug/lib/libswscale.a the table of
contents is empty (no object file members in the library define global symbols)
This would then cause linker failures for libkodi.so with the inability to find ffmpeg symbols
when built on osx host.
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 2748b0fbb5..f09258058b 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -19,6 +19,7 @@ if(CROSSCOMPILING) --enable-cross-compile --enable-pic --ar=${CMAKE_AR} + --ranlib=${CMAKE_RANLIB} --strip=${CMAKE_STRIP} ) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 7e5f41b7b3..9f0014dec7 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -23,6 +23,9 @@ endif ifeq ($(CROSS_COMPILING), yes) CMAKE_ARGS+= -DPKG_CONFIG_EXECUTABLE=$(NATIVEPREFIX)/bin/pkg-config \ -DCROSSCOMPILING=$(CROSS_COMPILING) + -DCMAKE_AR=$(AR) \ + -DCMAKE_RANLIB=$(RANLIB) \ + -DCMAKE_STRIP=$(STRIP) endif ifeq ($(OS), android) |