diff options
| author | Memphiz <memphis@machzwo.de> | 2017-09-25 19:54:30 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2017-10-30 00:32:23 +0100 |
| commit | 1b4c6a48610360977fb22fc6ee093b63f31138ec (patch) | |
| tree | 5c4cd14cae7e966251b92f36f62c4eeed02025f8 /tools | |
| parent | 920f23302553236bec41c61d8bd25f0be6e13c44 (diff) | |
[depends/samba] - fixed compile for tvos with ios/tvos 11 sdk (missing crt_extensions.h)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/samba-gplv3/Makefile | 5 | ||||
| -rw-r--r-- | tools/depends/target/samba-gplv3/crt_extensions.patch | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile index ea529717b0..6158b388df 100644 --- a/tools/depends/target/samba-gplv3/Makefile +++ b/tools/depends/target/samba-gplv3/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile autotools41.patch configureEndian.patch samba_android.patch samba_off64_t.patch no_fork_and_exec.patch +DEPS= ../../Makefile.include Makefile autotools41.patch configureEndian.patch samba_android.patch samba_off64_t.patch no_fork_and_exec.patch crt_extensions.patch # lib name, version LIBNAME=samba @@ -57,8 +57,9 @@ ifeq ($(OS),android) cd $(PLATFORM); patch -p0 < ../samba_android.patch cd $(PLATFORM); patch -p1 < ../samba_off64_t.patch endif -ifeq ($(TARGET_PLATFORM),appletvos) +ifeq ($(OS), ios) cd $(PLATFORM); patch -p0 < ../no_fork_and_exec.patch + cd $(PLATFORM); patch -p0 < ../crt_extensions.patch endif 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" diff --git a/tools/depends/target/samba-gplv3/crt_extensions.patch b/tools/depends/target/samba-gplv3/crt_extensions.patch new file mode 100644 index 0000000000..3b327cf4a6 --- /dev/null +++ b/tools/depends/target/samba-gplv3/crt_extensions.patch @@ -0,0 +1,11 @@ +--- lib/replace/replace.h 2017-09-25 19:50:26.000000000 +0200 ++++ lib/replace/replace.h 2017-09-25 19:48:25.000000000 +0200 +@@ -197,7 +197,7 @@ + + #if !HAVE_DECL_ENVIRON + #ifdef __APPLE__ +-#include <crt_externs.h> ++//#include <crt_externs.h> + #define environ (*_NSGetEnviron()) + #else + extern char **environ; |