Skip to content

Commit

Permalink
[depends/samba] - fixed compile for tvos with ios/tvos 11 sdk (missin…
Browse files Browse the repository at this point in the history
…g crt_extensions.h)
  • Loading branch information
Memphiz committed Oct 29, 2017
1 parent 920f233 commit 1b4c6a4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
5 changes: 3 additions & 2 deletions 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
Expand Down Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions 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;

0 comments on commit 1b4c6a4

Please sign in to comment.