Kaydet (Commit) 018f875c authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Avoid API present from macOS 10.13 if building to run on older

utimensat() and futimens() are new in 10.13.

Change-Id: I03448adb17b40a646771c37179bd70c787547ca3
üst 856ba5f7
......@@ -46,4 +46,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3, \
))
endif
ifeq ($(OS),MACOSX)
ifneq ($(filter 1090 101000 101100 101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),)
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python3-osx-avoid-new-10.13.patch.1 \
))
endif
endif
# vim: set noet sw=4 ts=4:
-*- Mode: Diff -*-
--- python3/Modules/posixmodule.c
+++ python3/Modules/posixmodule.c
@@ -4565,12 +4565,12 @@
} \
-#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)
+#if defined(HAVE_FUTIMESAT)
static int
utime_dir_fd(utime_t *ut, int dir_fd, char *path, int follow_symlinks)
{
-#ifdef HAVE_UTIMENSAT
+#if 0
int flags = follow_symlinks ? 0 : AT_SYMLINK_NOFOLLOW;
UTIME_TO_TIMESPEC;
return utimensat(dir_fd, path, time, flags);
@@ -4591,12 +4591,12 @@
#define FUTIMENSAT_DIR_FD_CONVERTER dir_fd_unavailable
#endif
-#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMENS)
+#if defined(HAVE_FUTIMES)
static int
utime_fd(utime_t *ut, int fd)
{
-#ifdef HAVE_FUTIMENS
+#if 0
UTIME_TO_TIMESPEC;
return futimens(fd, time);
#else
@@ -4619,7 +4619,7 @@
static int
utime_nofollow_symlinks(utime_t *ut, char *path)
{
-#ifdef HAVE_UTIMENSAT
+#if 0
UTIME_TO_TIMESPEC;
return utimensat(DEFAULT_DIR_FD, path, time, AT_SYMLINK_NOFOLLOW);
#else
@@ -4635,7 +4635,7 @@
static int
utime_default(utime_t *ut, char *path)
{
-#ifdef HAVE_UTIMENSAT
+#if 0
UTIME_TO_TIMESPEC;
return utimensat(DEFAULT_DIR_FD, path, time, 0);
#elif defined(HAVE_UTIMES)
@@ -4836,7 +4836,7 @@
else
#endif
-#if defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMENSAT)
+#if defined(HAVE_FUTIMESAT)
if ((dir_fd != DEFAULT_DIR_FD) || (!follow_symlinks))
result = utime_dir_fd(&utime, dir_fd, path->narrow, follow_symlinks);
else
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment