diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-04-26 17:12:00 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2016-04-26 17:12:00 +0200 |
| commit | ded3cfc9e4f6085275f3262b30cb36c8b41c0bff (patch) | |
| tree | ba1816c887ffe0583b1ce9949144a8ebf8b26c4e | |
| parent | 0f61af537dcb276ffef7c65cd9229bbf62649cdd (diff) | |
| parent | 76f882006e6e8eedb593b9de0e99ced5e33bf94f (diff) | |
Merge pull request #9289 from shadamik/ios_openssl
[depends] - build fixes for libxslt and openssl
| -rw-r--r-- | tools/depends/target/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/openssl/Makefile | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index b4baabae01..2818a5f45a 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -102,7 +102,7 @@ nettle: gmp pythonmodule-pil: $(ZLIB) libjpeg-turbo libpng freetype2 python27 pythonmodule-setuptools pythonmodule-setuptools: python27 libsdl2: $(LINUX_SYSTEM_LIBS) -libxslt: libgcrypt +libxslt: libgcrypt libxml2 ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis $(FFMPEG_DEPENDS) libcec: platform crossguid: $(CROSSGUID_DEPS) diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile index b3b0393721..1637aae6d2 100644 --- a/tools/depends/target/openssl/Makefile +++ b/tools/depends/target/openssl/Makefile @@ -13,8 +13,7 @@ ifeq ($(OS), android) CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib linux-generic32 endif ifeq ($(OS), ios) - # No darwin-arm-cc so use darwin-i386-cc and patch files after configure - CONFIGURE=./Configure darwin-i386-cc zlib no-asm no-krb5 --openssldir=$(PREFIX) + CONFIGURE=./Configure iphoneos-cross zlib no-asm no-krb5 --openssldir=$(PREFIX) endif ifeq ($(OS), osx) ifeq ($(CPU),x86_64) @@ -34,17 +33,16 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - #when compiled on darwin it just won't realise that we do crosscompiling - #so it would stick in -arch i386 or -arch x86_64 into the cflags - #that would break the cross compile so we have to get rid of these cd $(PLATFORM); AR="$(AR)" CFLAGS="$(CFLAGS)" CC=$(CC) RANLIB=$(RANLIB) $(CONFIGURE) if test "$(OS)" = "osx"; then \ sed -ie "s|CC= /usr/bin/gcc-4.2|CC= $(CC)|" "$(PLATFORM)/Makefile"; \ sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \ fi + # for iphoneos-cross config a sysroot argument is added + # however sysroot already set in Makefile.include, so remove this if test "$(OS)" = "ios"; then \ sed -ie "s|CFLAG= |CFLAG=$(CFLAGS) |" "$(PLATFORM)/Makefile"; \ - sed -ie "s|-arch i386|-arch $(CPU)|" "$(PLATFORM)/Makefile"; \ + sed -ie "s|-isysroot \$$(CROSS_TOP)/SDKs/\$$(CROSS_SDK) ||" "$(PLATFORM)/Makefile"; \ sed -ie "s|static volatile sig_atomic_t intr_signal;|static volatile intr_signal;|" "$(PLATFORM)/crypto/ui/ui_openssl.c"; \ fi sed -ie "s|apps test||" "$(PLATFORM)/Makefile"; \ |