mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
126 lines
4.1 KiB
Diff
126 lines
4.1 KiB
Diff
--- src/unix/darwin-proctitle.c.orig
|
|
+++ src/unix/darwin-proctitle.c
|
|
@@ -41,9 +41,11 @@
|
|
strncpy(namebuf, name, sizeof(namebuf) - 1);
|
|
namebuf[sizeof(namebuf) - 1] = '\0';
|
|
|
|
+#if TARGET_OS_IPHONE || (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
|
|
err = pthread_setname_np(namebuf);
|
|
if (err)
|
|
return UV__ERR(err);
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
--- src/unix/fs.c.orig
|
|
+++ src/unix/fs.c
|
|
@@ -1061,7 +1061,7 @@
|
|
|
|
return -1;
|
|
}
|
|
-#elif defined(__APPLE__) || \
|
|
+#elif (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)) || \
|
|
defined(__DragonFly__) || \
|
|
defined(__FreeBSD__) || \
|
|
defined(__FreeBSD_kernel__)
|
|
@@ -1441,7 +1441,7 @@
|
|
dst->st_blksize = src->st_blksize;
|
|
dst->st_blocks = src->st_blocks;
|
|
|
|
-#if defined(__APPLE__)
|
|
+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)
|
|
dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
|
|
dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
|
|
dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
|
|
--- src/unix/process.c.orig
|
|
+++ src/unix/process.c
|
|
@@ -36,7 +36,9 @@
|
|
#include <poll.h>
|
|
|
|
#if defined(__APPLE__)
|
|
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
|
|
# include <spawn.h>
|
|
+#endif
|
|
# include <paths.h>
|
|
# include <sys/kauth.h>
|
|
# include <sys/types.h>
|
|
@@ -387,7 +389,7 @@
|
|
#endif
|
|
|
|
|
|
-#if defined(__APPLE__)
|
|
+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
|
|
typedef struct uv__posix_spawn_fncs_tag {
|
|
struct {
|
|
int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *);
|
|
@@ -588,9 +590,11 @@
|
|
}
|
|
}
|
|
|
|
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
|
|
if (fd == use_fd)
|
|
err = posix_spawn_file_actions_addinherit_np(actions, fd);
|
|
else
|
|
+#endif
|
|
err = posix_spawn_file_actions_adddup2(actions, use_fd, fd);
|
|
assert(err != ENOSYS);
|
|
if (err != 0)
|
|
@@ -839,7 +843,7 @@
|
|
int exec_errorno;
|
|
ssize_t r;
|
|
|
|
-#if defined(__APPLE__)
|
|
+#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050)
|
|
uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn);
|
|
|
|
/* Special child process spawn case for macOS Big Sur (11.0) onwards
|
|
--- src/unix/tty.c.orig
|
|
+++ src/unix/tty.c
|
|
@@ -85,7 +85,7 @@
|
|
int dummy;
|
|
|
|
result = ioctl(fd, TIOCGPTN, &dummy) != 0;
|
|
-#elif defined(__APPLE__)
|
|
+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
|
|
char dummy[256];
|
|
|
|
result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
|
|
--- src/unix/udp.c.orig
|
|
+++ src/unix/udp.c
|
|
@@ -938,6 +938,7 @@
|
|
!defined(__ANDROID__) && \
|
|
!defined(__DragonFly__) && \
|
|
!defined(__QNX__) && \
|
|
+ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
|
|
!defined(__GNU__)
|
|
static int uv__udp_set_source_membership4(uv_udp_t* handle,
|
|
const struct sockaddr_in* multicast_addr,
|
|
@@ -1131,6 +1132,7 @@
|
|
!defined(__ANDROID__) && \
|
|
!defined(__DragonFly__) && \
|
|
!defined(__QNX__) && \
|
|
+ (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \
|
|
!defined(__GNU__)
|
|
int err;
|
|
union uv__sockaddr mcast_addr;
|
|
--- test/test-fs.c.orig
|
|
+++ test/test-fs.c
|
|
@@ -1410,7 +1410,7 @@
|
|
ASSERT(0 == uv_fs_fstat(NULL, &req, file, NULL));
|
|
ASSERT(req.result == 0);
|
|
s = req.ptr;
|
|
-# if defined(__APPLE__)
|
|
+# if defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
|
|
ASSERT(s->st_birthtim.tv_sec == t.st_birthtimespec.tv_sec);
|
|
ASSERT(s->st_birthtim.tv_nsec == t.st_birthtimespec.tv_nsec);
|
|
# elif defined(__linux__)
|
|
@@ -1451,7 +1451,7 @@
|
|
ASSERT(s->st_size == (uint64_t) t.st_size);
|
|
ASSERT(s->st_blksize == (uint64_t) t.st_blksize);
|
|
ASSERT(s->st_blocks == (uint64_t) t.st_blocks);
|
|
-#if defined(__APPLE__)
|
|
+#if defined(__APPLE__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050)
|
|
ASSERT(s->st_atim.tv_sec == t.st_atimespec.tv_sec);
|
|
ASSERT(s->st_atim.tv_nsec == t.st_atimespec.tv_nsec);
|
|
ASSERT(s->st_mtim.tv_sec == t.st_mtimespec.tv_sec);
|