[ios/build] rename core_system_name to darwin_embedded

implement darwin_embedded CORE_SYSTEM_NAME and OS.
This provides a single parent for ios/tvos common build code, and allows ios/tvos
specific code via CORE_PLATFORM_NAME

28 files changed, 47 insertions, 44 deletions

diff --git a/tools/buildsteps/ios/package b/tools/buildsteps/ios/package
index 08458ca5b2..81f9030677 100755
--- a/tools/buildsteps/ios/package
+++ b/tools/buildsteps/ios/package
@@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=ios
 . $WORKSPACE/tools/buildsteps/defaultenv
 
 cd $WORKSPACE/build;make -j$BUILDTHREADS deb
-cd $WORKSPACE/build/tools/darwin/packaging/ios/
+cd $WORKSPACE/build/tools/darwin/packaging/darwin_embedded/
 
 #rename for upload
 #e.x. kodi-20130314-8c2fb31-Frodo-ios.deb
@@ -13,4 +13,5 @@ then
 else
   UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-ios.deb"
 fi
+mkdir $WORKSPACE/tools/darwin/packaging/ios
 mv *.deb $WORKSPACE/tools/darwin/packaging/ios/$UPLOAD_FILENAME
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-darwin_embedded.command
index 9bca3a8017..9bca3a8017 100755
--- a/tools/darwin/Support/CopyRootFiles-ios.command
+++ b/tools/darwin/Support/CopyRootFiles-darwin_embedded.command
diff --git a/tools/darwin/Support/copyframeworks-ios.command b/tools/darwin/Support/copyframeworks-darwin_embedded.command
index d52033ebf9..d52033ebf9 100755
--- a/tools/darwin/Support/copyframeworks-ios.command
+++ b/tools/darwin/Support/copyframeworks-darwin_embedded.command
diff --git a/tools/darwin/packaging/migrate_to_kodi_ios.sh.in b/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
index be9155fa8c..be9155fa8c 100644
--- a/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
+++ b/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in
index 511c214604..fdcb4c557d 100644
--- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in
+++ b/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in
@@ -103,7 +103,7 @@ chmod +x $DIRNAME/$PACKAGE/DEBIAN/prerm
 # postinst: nothing for now.
 echo "#!/bin/sh"                                  >  $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "chown -R mobile:mobile /Applications/@APP_NAME@.app" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-cat $DIRNAME/../migrate_to_kodi_ios.sh            >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+cat $DIRNAME/migrate_to_kodi.sh            >> $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "/usr/bin/uicache"                           >>  $DIRNAME/$PACKAGE/DEBIAN/postinst
 echo "echo 'finish:respringing ...'"              >>  $DIRNAME/$PACKAGE/DEBIAN/postinst
 chmod +x $DIRNAME/$PACKAGE/DEBIAN/postinst
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index 66f7e96ace..dc40d32722 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -364,7 +364,7 @@ case $host in
           esac
         fi
 
-        platform_os="ios"
+        platform_os="darwin_embedded"
 
         if [ ! test "x$use_cpu" = "xarm64" ]; then
           platform_cflags+=" -mcpu=cortex-a8 -mfpu=neon"
@@ -422,8 +422,8 @@ case $use_platform in
      platform_ldflags="-lpthread"
      ;;
   tvos)
-    if test "$platform_os" != "ios"; then
-      AC_MSG_ERROR([$use_platform is only supported on the ios platform])
+    if test "$platform_os" != "darwin_embedded"; then
+      AC_MSG_ERROR([$use_platform is only supported on the darwin_embedded platform])
     fi
     ;;
   auto)
@@ -563,13 +563,13 @@ if test "$platform_os" == "android"; then
 fi
 
 # darwin needs unzip/zip in Codesign.command
-if test "$platform_os" = "android" || test "$platform_os" = "osx" || test "$platform_os" = "ios"; then
+if test "$platform_os" = "android" || test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then
   AC_CHECK_PROG(HAVE_UNZIP,unzip,"yes","no",)
   if test "x$HAVE_UNZIP" = "xno"; then
     AC_MSG_ERROR("Missing program: unzip")
   fi
 fi
-if test "$platform_os" = "osx" || test "$platform_os" = "ios"; then
+if test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then
   AC_CHECK_PROG(HAVE_ZIP,zip,"yes","no",)
   if test "x$HAVE_ZIP" = "xno"; then
     AC_MSG_ERROR("Missing program: zip")
@@ -616,7 +616,7 @@ tmp_cxxflags=$(echo $cxx11_flags $platform_cxxflags | sed 's/-O@<:@123@:>@//g;s/
 release_cflags="-DNDEBUG=1"
 
 # newer xcode version accept -Og flag, but debugging doesn't work with it
-if test "$platform_os" = "osx" || test "$platform_os" = "ios"; then
+if test "$platform_os" = "osx" || test "$platform_os" = "darwin_embedded"; then
   debug_cflags="-g -D_DEBUG"
 else
   CFLAGS="$tmp_cflags -Og -g -D_DEBUG"
@@ -685,7 +685,7 @@ AC_SUBST(ffmpeg_options)
 
 AC_OUTPUT
 
-if test "$platform_os" == "ios"; then
+if test "$platform_os" == "darwin_embedded"; then
   if test "$use_platform" = "tvos"; then
     simulator_sdk_path=[`$use_xcodebuild -version -sdk appletvsimulator$use_sdk  | grep ^Path | awk '{ print $2}'`]
   else
diff --git a/tools/depends/m4/xbmc_arch.m4 b/tools/depends/m4/xbmc_arch.m4
index ce3467114b..36aee1093e 100644
--- a/tools/depends/m4/xbmc_arch.m4
+++ b/tools/depends/m4/xbmc_arch.m4
@@ -46,7 +46,7 @@ case $host in
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD")
      ;;
   arm-apple-darwin*)
-     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS")
+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_EMBEDDED")
      ;;
   *86*-apple-darwin*)
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX")
diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile
index 5324b91eed..7a04699600 100644
--- a/tools/depends/native/Makefile
+++ b/tools/depends/native/Makefile
@@ -13,7 +13,7 @@ NATIVE= m4 gettext autoconf automake \
         flatbuffers
 
 
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   NATIVE += dpkg xz tar gen_entitlements ldid
 endif
 
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 0053e67d41..3e9e71c712 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -26,7 +26,7 @@ else
   DEPENDS+=samba libcdio
 endif
 
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   EXCLUDED_DEPENDS = libcec libusb
   ifeq ($(TARGET_PLATFORM),appletvos)
     DEPENDS += boblight
diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in
index f32eae94cf..12004050d6 100644
--- a/tools/depends/target/Toolchain.cmake.in
+++ b/tools/depends/target/Toolchain.cmake.in
@@ -30,12 +30,13 @@ elseif(OS STREQUAL android)
 elseif(OS STREQUAL osx)
   set(CMAKE_SYSTEM_NAME Darwin)
   set(CORE_SYSTEM_NAME osx)
-elseif(OS STREQUAL ios)
+elseif(OS STREQUAL darwin_embedded)
   set(CMAKE_SYSTEM_NAME Darwin)
-  set(CORE_SYSTEM_NAME ios)
+  set(CORE_SYSTEM_NAME darwin_embedded)
+  set(CORE_PLATFORM_NAME ios)
 endif()
 
-if(CORE_SYSTEM_NAME STREQUAL ios)
+if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   # Necessary to build the main Application (but not other dependencies)
   # with Xcode (and a bundle with Makefiles) (https://cmake.org/Bug/view.php?id=15329)
   if(NOT PROJECT_SOURCE_DIR MATCHES "tools/depends")
@@ -48,7 +49,7 @@ if(CORE_SYSTEM_NAME STREQUAL ios)
   endif()
 endif()
 
-if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL osx)
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(CMAKE_OSX_SYSROOT @use_sdk_path@)
   set(CMAKE_XCODE_ATTRIBUTE_ARCHS ${CPU})
   set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET 9.0)
diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in
index a889085ecf..a4780ae595 100644
--- a/tools/depends/target/Toolchain_binaddons.cmake.in
+++ b/tools/depends/target/Toolchain_binaddons.cmake.in
@@ -33,15 +33,16 @@ elseif(OS STREQUAL osx)
   if(NOT APP_RENDER_SYSTEM)
     set(APP_RENDER_SYSTEM gl)
   endif()
-elseif(OS STREQUAL ios)
+elseif(OS STREQUAL darwin_embedded)
   set(CMAKE_SYSTEM_NAME Darwin)
-  set(CORE_SYSTEM_NAME ios)
+  set(CORE_SYSTEM_NAME darwin_embedded)
+  set(CORE_PLATFORM_NAME ios)
   if(NOT APP_RENDER_SYSTEM)
     set(APP_RENDER_SYSTEM gles)
   endif()
 endif()
 
-if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL osx)
+if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(CMAKE_OSX_SYSROOT @use_sdk_path@)
   list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT}/usr /usr/X11R6)
   set(CMAKE_LIBRARY_PATH @CMAKE_FIND_ROOT_PATH@/lib:@use_sdk_path@/lib:/usr/X11R6/lib)
diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile
index e34ffcc21d..e048c2b42e 100644
--- a/tools/depends/target/boblight/Makefile
+++ b/tools/depends/target/boblight/Makefile
@@ -40,7 +40,7 @@ $(LIBDYLIB): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 ifeq ($(TARGET_PLATFORM),appletvos)
 	#deploy into source tree for tvos - we distribute libboblight with the bundle...
 	cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(CMAKE_SOURCE_DIR)/system/libboblight-tvos.0.dylib
diff --git a/tools/depends/target/config-binaddons.site.in b/tools/depends/target/config-binaddons.site.in
index 38c5d20134..3c61910a47 100644
--- a/tools/depends/target/config-binaddons.site.in
+++ b/tools/depends/target/config-binaddons.site.in
@@ -15,7 +15,7 @@ STRIP="@STRIP@"
 RANLIB="@RANLIB@"
 OBJDUMP="@OBJDUMP@"
 
-if test "@platform_os@" = "ios" ; then
+if test "@platform_os@" = "darwin_embedded" ; then
   export AS="@prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@ -arch @use_cpu@"
   export CCAS="--tag CC @prefix@/@tool_dir@/bin/gas-preprocessor.pl @CC@ -arch @use_cpu@"
 fi
@@ -70,7 +70,7 @@ ac_cv_file__proc_sys_kernel_core_pattern=no
 samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
 libreplace_cv_HAVE_GETADDRINFO=no
 
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "ios"; then
+if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "darwin_embedded"; then
   # disable python support
   export PYTHON_VER=0.0
   # ios/osx-10.6 issue with collision of _MD5 exported from a system lib
@@ -125,7 +125,7 @@ if test "@platform_os@" = "osx" ; then
 fi
 
 
-if test "@platform_os@" = "ios"; then
+if test "@platform_os@" = "darwin_embedded"; then
   # Xcode 8 + 10.11, clock_gettime getentropy is present
   # in 10.12 but will get wrongly detected if building on 10.11
   ac_cv_search_clock_gettime=no
diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in
index 36bf2fced2..64c07369e4 100644
--- a/tools/depends/target/config.site.in
+++ b/tools/depends/target/config.site.in
@@ -15,7 +15,7 @@ STRIP="@STRIP@"
 RANLIB="@RANLIB@"
 OBJDUMP="@OBJDUMP@"
 
-if test "@platform_os@" = "ios" ; then
+if test "@platform_os@" = "darwin_embedded" ; then
   export AS="@prefix@/@tool_dir@/bin/gas-preprocessor.pl @CCACHE@ @CC@ -arch @use_cpu@"
   export CCAS="--tag CC @prefix@/@tool_dir@/bin/gas-preprocessor.pl @CCACHE@ @CC@ -arch @use_cpu@"
 fi
@@ -82,7 +82,7 @@ ac_cv_file__proc_sys_kernel_core_pattern=no
 samba_cv_SYSCONF_SC_NPROCESSORS_ONLN=no
 libreplace_cv_HAVE_GETADDRINFO=no
 
-if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "ios"; then
+if test "${PACKAGE_NAME}" = "Samba" -a "@platform_os@" = "darwin_embedded"; then
   # disable python support
   export PYTHON_VER=0.0
   if test "@use_cpu@" != "arm64"; then
@@ -146,7 +146,7 @@ if test "@platform_os@" = "osx" ; then
 fi
 
 
-if test "@platform_os@" = "ios"; then
+if test "@platform_os@" = "darwin_embedded"; then
   # Xcode 8 + 10.11, clock_gettime and getentropy is present
   # in 10.12 but will get wrongly detected if building on 10.11
   ac_cv_search_clock_gettime=no
diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile
index bb676f546c..3936f651e1 100644
--- a/tools/depends/target/crossguid/Makefile
+++ b/tools/depends/target/crossguid/Makefile
@@ -30,7 +30,7 @@ GUID_PLATFORM_DEFINE=GUID_LIBUUID
 ifeq ($(OS),osx)
 	GUID_PLATFORM_DEFINE=GUID_CFUUID
 endif
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 	GUID_PLATFORM_DEFINE=GUID_CFUUID
 endif
 
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
index 4a2622216c..5ee90c4b79 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -63,7 +63,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
     list(APPEND ffmpeg_conf --cpu=i686 --disable-mmx)
   endif()
   list(APPEND ffmpeg_conf --target-os=linux --extra-libs=-liconv --disable-linux-perf)
-elseif(CORE_SYSTEM_NAME STREQUAL ios)
+elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   if(NOT CPU MATCHES arm64)
     list(APPEND ffmpeg_conf --cpu=cortex-a8)
   else()
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
index c42e67e7da..731109ff24 100644
--- a/tools/depends/target/ffmpeg/Makefile
+++ b/tools/depends/target/ffmpeg/Makefile
@@ -43,7 +43,7 @@ ifeq ($(OS), android)
   endif
   ffmpg_config += --target-os=linux --extra-libs=-liconv --disable-linux-perf
 endif
-ifeq ($(OS), ios)
+ifeq ($(OS), darwin_embedded)
   ifneq ($(CPU), arm64)
     ffmpg_config += --cpu=cortex-a8
     ffmpg_config += --as="$(NATIVEPREFIX)/bin/gas-preprocessor.pl -- $(CC)"
@@ -81,7 +81,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM);\
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	./configure $(ffmpg_config)
-ifeq ($(OS), ios)
+ifeq ($(OS), darwin_embedded)
 	cd $(PLATFORM); sed -i -- 's/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g' config.h
 endif
 
diff --git a/tools/depends/target/gmp/Makefile b/tools/depends/target/gmp/Makefile
index cf14bccec6..1bc119f71e 100644
--- a/tools/depends/target/gmp/Makefile
+++ b/tools/depends/target/gmp/Makefile
@@ -18,7 +18,7 @@ ifeq ($(OS),linux)
   endif
 endif
 
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 CONFIGURE_FLAGS=--disable-assembly
 endif
 ifeq ($(OS),osx)
diff --git a/tools/depends/target/libdvdnav/Makefile b/tools/depends/target/libdvdnav/Makefile
index fab216472c..eada58a160 100644
--- a/tools/depends/target/libdvdnav/Makefile
+++ b/tools/depends/target/libdvdnav/Makefile
@@ -25,7 +25,7 @@ endif
 ifeq ($(OS),osx)
   EXTRA_CFLAGS +=  -D__DARWIN__
 endif
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   EXTRA_CFLAGS +=  -D__DARWIN__
 endif
 
diff --git a/tools/depends/target/libdvdread/Makefile b/tools/depends/target/libdvdread/Makefile
index e9fd9b10a4..d240953fe4 100644
--- a/tools/depends/target/libdvdread/Makefile
+++ b/tools/depends/target/libdvdread/Makefile
@@ -24,7 +24,7 @@ endif
 ifeq ($(OS),osx)
   EXTRA_CFLAGS +=  -D__DARWIN__
 endif
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   EXTRA_CFLAGS +=  -D__DARWIN__
 endif
 
diff --git a/tools/depends/target/libgpg-error/Makefile b/tools/depends/target/libgpg-error/Makefile
index b4c0714af3..d0c108cd1b 100644
--- a/tools/depends/target/libgpg-error/Makefile
+++ b/tools/depends/target/libgpg-error/Makefile
@@ -25,7 +25,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 ifeq ($(CPU),arm64)
 	cp $(PLATFORM)/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $(PLATFORM)/src/syscfg/lock-obj-pub.arm-apple-darwin.h
 endif
diff --git a/tools/depends/target/nettle/Makefile b/tools/depends/target/nettle/Makefile
index a559b1c33d..4d2f43427d 100644
--- a/tools/depends/target/nettle/Makefile
+++ b/tools/depends/target/nettle/Makefile
@@ -7,7 +7,7 @@ VERSION=3.2
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   CONFIGURE_FLAGS=-disable-assembler
 endif
 
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
index cabe8f03d3..70929763e7 100644
--- a/tools/depends/target/openssl/Makefile
+++ b/tools/depends/target/openssl/Makefile
@@ -12,7 +12,7 @@ CONFIGURE=MACHINE=$(PLATFORM) ./config no-shared zlib no-asm --prefix=$(PREFIX)
 ifeq ($(OS), android)
   CONFIGURE=./Configure no-shared zlib --prefix=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib linux-generic32 -D__ANDROID_API__=$(NDK_LEVEL)
 endif
-ifeq ($(OS), ios)
+ifeq ($(OS), darwin_embedded)
   ifeq ($(TARGET_PLATFORM),appletvos)
     # Need to add "no-async" to avoid "'setcontext' is unavailable: not available on tvOS" error
     CONFIGURE=./Configure iphoneos-cross no-shared zlib no-asm no-async --prefix=$(PREFIX)
@@ -44,7 +44,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	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 \
+	if test "$(OS)" = "darwin_embedded"; then \
 		sed -E -ie "s|^CFLAGS=-|CFLAGS=$(CFLAGS) -|" "$(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"; \
diff --git a/tools/depends/target/python27/Makefile b/tools/depends/target/python27/Makefile
index b38fc0dc14..4fc2446479 100644
--- a/tools/depends/target/python27/Makefile
+++ b/tools/depends/target/python27/Makefile
@@ -11,7 +11,7 @@ ARCHIVE=$(SOURCE).tar.xz
 ifeq ($(OS),osx)
   HOSTPLATFORM=_PYTHON_HOST_PLATFORM="darwin"
 endif
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
   HOSTPLATFORM=_PYTHON_HOST_PLATFORM="darwin"
   LINK_ICONV=-framework CoreFoundation -liconv
 endif
@@ -42,7 +42,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); patch -p1 -i ../android-binmodule.patch
 	cd $(PLATFORM); patch -p1 -i ../no-abort.patch
 	cd $(PLATFORM); patch -p1 -i ../android-nl_langinfo.patch
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 	cd $(PLATFORM); patch -p1 -i ../make-fork-optional.patch
 	cd $(PLATFORM); patch -p1 -i ../urllib.patch
 	cd $(PLATFORM); sed -ie 's|MACHDEP="unknown"|MACHDEP="darwin"|' configure.ac
diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile
index 10ce087185..96ed12d50e 100644
--- a/tools/depends/target/pythonmodule-pil/Makefile
+++ b/tools/depends/target/pythonmodule-pil/Makefile
@@ -17,7 +17,7 @@ CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" LDSHARED="$(CC) -shar
 endif
 
 ifeq (darwin, $(findstring darwin, $(HOST)))
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 PYTHON_O=$(abs_top_srcdir)/target/python27/$(PLATFORM)/Modules/python.o
 endif
 #ensure that only our target ldflags are passed to the python build
diff --git a/tools/depends/target/pythonmodule-pycryptodome/Makefile b/tools/depends/target/pythonmodule-pycryptodome/Makefile
index 583b2d92f9..9f2c0f59ec 100644
--- a/tools/depends/target/pythonmodule-pycryptodome/Makefile
+++ b/tools/depends/target/pythonmodule-pycryptodome/Makefile
@@ -16,7 +16,7 @@ CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" LDSHARED="$(CC) -shar
 endif
 
 ifeq (darwin, $(findstring darwin, $(HOST)))
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 PYTHON_O=$(abs_top_srcdir)/target/python27/$(PLATFORM)/Modules/python.o
 endif
 #ensure that only our target ldflags are passed to the python build
diff --git a/tools/depends/target/pythonmodule-setuptools/Makefile b/tools/depends/target/pythonmodule-setuptools/Makefile
index 69dba4c7b9..f498f57611 100644
--- a/tools/depends/target/pythonmodule-setuptools/Makefile
+++ b/tools/depends/target/pythonmodule-setuptools/Makefile
@@ -18,7 +18,7 @@ endif
 ifeq ($(OS),osx)
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC)" LDSHARED="$(CC) -shared" LDFLAGS="$(LDFLAGS) -lpython" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/"
 endif
-ifeq ($(OS),ios)
+ifeq ($(OS),darwin_embedded)
 PYTHON_O=$(abs_top_srcdir)/target/python27/$(PLATFORM)/Modules/python.o
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/"
 endif
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
index 88625c214f..d4a1dbe6ca 100644
--- a/tools/depends/target/samba-gplv3/Makefile
+++ b/tools/depends/target/samba-gplv3/Makefile
@@ -7,7 +7,7 @@ VERSION=4.1.23
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
-ifeq ($(OS), ios)
+ifeq ($(OS), darwin_embedded)
 ifeq ($(CPU), arm64)
 # clang issue with optimizing out functions
 CONFIGURE_EXTRAS= --without-libmsrpc samba_cv_optimize_out_funcation_calls=no ac_cv_func_yp_get_default_domain=no
@@ -53,7 +53,7 @@ ifeq ($(OS),android)
 	cd $(PLATFORM); patch -p1 -i ../samba_android.patch
 	cd $(PLATFORM); patch -p1 -i ../samba_off64_t.patch
 endif
-ifeq ($(OS), ios)
+ifeq ($(OS), darwin_embedded)
 	cd $(PLATFORM); patch -p1 -i ../no_fork_and_exec.patch
 	cd $(PLATFORM); patch -p1 -i ../crt_extensions.patch
 endif