diff options
| -rw-r--r-- | tools/depends/native/cmake-native/01-osx-utimensat.diff | 35 | ||||
| -rw-r--r-- | tools/depends/native/cmake-native/Makefile | 5 |
2 files changed, 2 insertions, 38 deletions
diff --git a/tools/depends/native/cmake-native/01-osx-utimensat.diff b/tools/depends/native/cmake-native/01-osx-utimensat.diff deleted file mode 100644 index 8ba4563a0d..0000000000 --- a/tools/depends/native/cmake-native/01-osx-utimensat.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- a/Source/kwsys/kwsysPlatformTestsCXX.cxx -+++ b/Source/kwsys/kwsysPlatformTestsCXX.cxx -@@ -265,6 +265,12 @@ int main() - #ifdef TEST_KWSYS_CXX_HAS_UTIMENSAT - #include <fcntl.h> - #include <sys/stat.h> -+#if defined(__APPLE__) -+#include <AvailabilityMacros.h> -+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101300 -+#error "utimensat not available on macOS < 10.13" -+#endif -+#endif - int main() - { - struct timespec times[2] = { { 0, UTIME_OMIT }, { 0, UTIME_NOW } }; ---- a/Utilities/cmlibarchive/libarchive/archive_platform.h -+++ b/Utilities/cmlibarchive/libarchive/archive_platform.h -@@ -52,6 +52,17 @@ - #error Oops: No config.h and no pre-built configuration in archive_platform.h. - #endif - -+/* On macOS check for some symbols based on the deployment target version. */ -+#if defined(__APPLE__) -+# undef HAVE_FUTIMENS -+# undef HAVE_UTIMENSAT -+# include <AvailabilityMacros.h> -+# if MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 -+# define HAVE_FUTIMENS 1 -+# define HAVE_UTIMENSAT 1 -+# endif -+#endif -+ - /* It should be possible to get rid of this by extending the feature-test - * macros to cover Windows API functions, probably along with non-trivial - * refactoring of code to find structures that sit more cleanly on top of diff --git a/tools/depends/native/cmake-native/Makefile b/tools/depends/native/cmake-native/Makefile index 54ba5c3059..24e251d72c 100644 --- a/tools/depends/native/cmake-native/Makefile +++ b/tools/depends/native/cmake-native/Makefile @@ -1,9 +1,9 @@ include ../../Makefile.include PLATFORM=$(NATIVEPLATFORM) -DEPS= ../../Makefile.include Makefile 01-osx-utimensat.diff +DEPS= ../../Makefile.include Makefile APPNAME=cmake -VERSION=3.9.4 +VERSION=3.12.2 SOURCE=$(APPNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -31,7 +31,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../01-osx-utimensat.diff cd $(PLATFORM); $(SETENV) $(CONFIGURE) $(APP): $(PLATFORM) |