diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-09-20 00:18:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-09-26 18:58:41 +0200 |
| commit | 0917993d078b58f19cbfcb27e67518cb260ef63c (patch) | |
| tree | b3f564db9a0208227f2051a7333877ebae08ef42 /external | |
| parent | 94feb1c7fefe89d67c8a2ba00063bb2252d92e66 (diff) | |
Avoid API present from macOS 10.13 if building to run on older
utimensat() and futimens() are new in 10.13.
(cherry picked from commit 018f875cb03aadd6fbb56cad463fef3ab932e274)
Change-Id: I1a928f6324dca98d47fbd8ed2cdd75b4935e1b12
Reviewed-on: https://gerrit.libreoffice.org/42806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 8 | ||||
| -rw-r--r-- | external/python3/python3-osx-avoid-new-10.13.patch.1 | 61 |
2 files changed, 69 insertions, 0 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index ce2087497db8..35d6e643a1b0 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -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: diff --git a/external/python3/python3-osx-avoid-new-10.13.patch.1 b/external/python3/python3-osx-avoid-new-10.13.patch.1 new file mode 100644 index 000000000000..93bf5a078e01 --- /dev/null +++ b/external/python3/python3-osx-avoid-new-10.13.patch.1 @@ -0,0 +1,61 @@ +-*- 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 |