LibUV: bump (#5361)

This commit is contained in:
extrowerk
2020-11-30 07:20:09 +01:00
committed by GitHub
parent 4e214e1bb7
commit 54dfffbbab
3 changed files with 67 additions and 44 deletions

View File

@@ -7,7 +7,7 @@ COPYRIGHT="2015-present libuv project contributors"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/libuv/libuv/archive/v$portVersion/libuv-$portVersion.tar.gz"
CHECKSUM_SHA256="ff84a26c79559e511f087aa67925c3b4e0f0aac60cd8039d4d38b292f208ff58"
CHECKSUM_SHA256="70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b"
PATCHES="libuv-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -53,7 +53,7 @@ BUILD()
{
./autogen.sh
runConfigure ./configure
LDFLAGS="-lnetwork" runConfigure ./configure
make $jobArgs
}

View File

@@ -1,42 +0,0 @@
From 7670c98857baba2789aeb3a8edf5431db07acea9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 8 Sep 2019 12:42:17 +0200
Subject: disable setpriority/getpriority for R1B1.
diff --git a/src/unix/core.c b/src/unix/core.c
index ffce948..d261962 100644
--- a/src/unix/core.c
+++ b/src/unix/core.c
@@ -1443,6 +1443,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
if (priority == NULL)
return UV_EINVAL;
+#ifdef __HAIKU__
+ return UV__ERR(ENOSYS);
+#else
errno = 0;
r = getpriority(PRIO_PROCESS, (int) pid);
@@ -1451,6 +1454,7 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
*priority = r;
return 0;
+#endif
}
@@ -1458,8 +1462,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
return UV_EINVAL;
+#ifndef __HAIKU__
if (setpriority(PRIO_PROCESS, (int) pid, priority) != 0)
return UV__ERR(errno);
+#endif
return 0;
}
--
2.23.0

View File

@@ -0,0 +1,65 @@
From 67b30cf984c7e63dcf675a01b3af0b42fac1e2dc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 8 Sep 2019 12:42:17 +0200
Subject: disable setpriority/getpriority for R1B1.
diff --git a/src/unix/core.c b/src/unix/core.c
index 1597828..bb8663c 100644
--- a/src/unix/core.c
+++ b/src/unix/core.c
@@ -1410,6 +1410,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
if (priority == NULL)
return UV_EINVAL;
+#ifdef __HAIKU__
+ return UV__ERR(ENOSYS);
+#else
errno = 0;
r = getpriority(PRIO_PROCESS, (int) pid);
@@ -1418,6 +1421,7 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
*priority = r;
return 0;
+#endif
}
@@ -1425,8 +1429,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
return UV_EINVAL;
+#ifndef __HAIKU__
if (setpriority(PRIO_PROCESS, (int) pid, priority) != 0)
return UV__ERR(errno);
+#endif
return 0;
}
--
2.28.0
From cbd75c20df89b117c89db0b507ab25cdc4741068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 29 Oct 2020 07:40:26 +0100
Subject: Test will not run as root
diff --git a/test/run-tests.c b/test/run-tests.c
index e5e75e1..554a539 100644
--- a/test/run-tests.c
+++ b/test/run-tests.c
@@ -52,7 +52,7 @@ static int maybe_run_test(int argc, char **argv);
int main(int argc, char **argv) {
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__HAIKU__)
if (0 == geteuid() && NULL == getenv("UV_RUN_AS_ROOT")) {
fprintf(stderr, "The libuv test suite cannot be run as root.\n");
return EXIT_FAILURE;
--
2.28.0