diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2017-05-30 18:50:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 18:50:07 +0100 |
| commit | 345b2c2e870f56a8686248be308fcf4bc0475567 (patch) | |
| tree | 4d91a84b8cd79301afa8cb0a27e147b581154c41 /tools/depends | |
| parent | b6b3026163aab67a1c52f4e04684b3240a5212bc (diff) | |
| parent | eee62dc716862daa3bd3e6557c72891ab994a996 (diff) | |
Merge pull request #12059 from Memphiz/osx_droid
[OSX] - fix compilation for android on OSX hosts.
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/Toolchain.cmake.in | 2 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain_binaddons.cmake.in | 2 | ||||
| -rw-r--r-- | tools/depends/target/zlib/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/target/zlib/remove_fixe_ar_osx.patch | 12 |
4 files changed, 18 insertions, 1 deletions
diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index 9752cdabd1..c0e4b955d4 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -47,6 +47,8 @@ set(CMAKE_CXX_COMPILER @CXX@) set(CMAKE_AR @AR@ CACHE FILEPATH "Archiver") set(CMAKE_LINKER @LD@ CACHE FILEPATH "Linker") set(CMAKE_STRIP @STRIP@ CACHE PATH "strip binary" FORCE) +set(CMAKE_OBJDUMP @OBJDUMP@ CACHE FILEPATH "Objdump") +set(CMAKE_RANLIB @RANLIB@ CACHE FILEPATH "Ranlib") if(PROJECT_SOURCE_DIR MATCHES "tools/depends") if(@use_ccache@ STREQUAL "yes") diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in index e96b77e085..75b1397301 100644 --- a/tools/depends/target/Toolchain_binaddons.cmake.in +++ b/tools/depends/target/Toolchain_binaddons.cmake.in @@ -35,6 +35,8 @@ set(CMAKE_C_COMPILER @CC@) set(CMAKE_CXX_COMPILER @CXX@) set(CMAKE_AR @AR@ CACHE FILEPATH "Archiver") set(CMAKE_LINKER @LD@ CACHE FILEPATH "Linker") +set(CMAKE_OBJDUMP @OBJDUMP@ CACHE FILEPATH "Objdump") +set(CMAKE_RANLIB @RANLIB@ CACHE FILEPATH "Ranlib") if(@use_ccache@ STREQUAL "yes") set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "@CCACHE@") diff --git a/tools/depends/target/zlib/Makefile b/tools/depends/target/zlib/Makefile index 551301ca57..415d8b88a0 100644 --- a/tools/depends/target/zlib/Makefile +++ b/tools/depends/target/zlib/Makefile @@ -7,7 +7,7 @@ VERSION=1.2.7 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings -CONFIGURE= CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure --prefix=$(PREFIX) --static +CONFIGURE= RANLIB="$(RANLIB)" LD="$(LD)" AR="$(AR)" CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure --prefix=$(PREFIX) --static LIBDYLIB=$(PLATFORM)/$(LIBNAME).a @@ -22,6 +22,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p0 < ../visibility.patch + cd $(PLATFORM); patch -p0 < ../remove_fixe_ar_osx.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/zlib/remove_fixe_ar_osx.patch b/tools/depends/target/zlib/remove_fixe_ar_osx.patch new file mode 100644 index 0000000000..d173751c7f --- /dev/null +++ b/tools/depends/target/zlib/remove_fixe_ar_osx.patch @@ -0,0 +1,12 @@ +--- configure 2012-05-02 06:17:08.000000000 +0200 ++++ configure.new 2017-04-26 18:42:06.000000000 +0200 +@@ -231,8 +231,7 @@ + SHAREDLIBV=libz.$VER$shared_ext + SHAREDLIBM=libz.$VER1$shared_ext + LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} +- AR="/usr/bin/libtool" +- ARFLAGS="-o" ;; ++ ;; + *) LDSHARED=${LDSHARED-"$cc -shared"} ;; + esac + else |