aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2016-09-23 09:28:28 +0200
committerMemphiz <memphis@machzwo.de>2016-12-23 17:34:43 +0100
commit1a33bca2a650fb420395f4f9f4a53c44670a3eee (patch)
treeb0bc67146bcb34778df6b21de210cbafdf9e828b /tools
parentb3a971a59d5e698a7771017339c4220fbd880a45 (diff)
[depends] - adapt the xcode8 patches for gnutls and samba to not only work on osx but ios too
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/target/gnutls/Makefile2
-rw-r--r--tools/depends/target/samba-gplv3/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile
index 1a7c2431c8..69efb3a5a1 100644
--- a/tools/depends/target/gnutls/Makefile
+++ b/tools/depends/target/gnutls/Makefile
@@ -33,7 +33,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p0 < ../size-max.patch
cd $(PLATFORM); $(CONFIGURE)
-ifeq ($(OS),osx)
+ifeq (darwin, $(findstring darwin, $(HOST)))
cd $(PLATFORM); sed -ie "s/HAVE_GETENTROPY/HAVE_GETENTROPY_NOPE/" config.h
endif
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
index f5d84bac76..e15987d9c4 100644
--- a/tools/depends/target/samba-gplv3/Makefile
+++ b/tools/depends/target/samba-gplv3/Makefile
@@ -55,7 +55,7 @@ endif
ifeq ($(TARGET_PLATFORM),appletvos)
cd $(PLATFORM); patch -p0 < ../no_fork_and_exec.patch
endif
-ifeq ($(OS),osx)
+ifeq (darwin, $(findstring darwin, $(HOST)))
sed -ie "s|ifndef HAVE_CLOCK_GETTIME|if !defined(HAVE_CLOCK_GETTIME) \&\& !defined(CLOCK_REALTIME)|" "$(PLATFORM)/lib/replace/system/time.h"
endif
cd $(PLATFORM)/source3; $(CONFIGURE)