diff --git a/dev-util/cmake/cmake-3.15.3.recipe b/dev-util/cmake/cmake-3.15.3.recipe index e31845043..364f7fb34 100644 --- a/dev-util/cmake/cmake-3.15.3.recipe +++ b/dev-util/cmake/cmake-3.15.3.recipe @@ -13,8 +13,8 @@ CHECKSUM_SHA256="13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f SOURCE_DIR="cmake-$portVersion" PATCHES="cmake-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" cmake$secondaryArchSuffix = $portVersion compat >= 3 diff --git a/dev-util/cmake/cmake-3.9.5.recipe b/dev-util/cmake/cmake-3.9.5.recipe index 22b987b26..7fef8909f 100644 --- a/dev-util/cmake/cmake-3.9.5.recipe +++ b/dev-util/cmake/cmake-3.9.5.recipe @@ -7,7 +7,7 @@ of your choice." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="3" +REVISION="4" SOURCE_URI="https://cmake.org/files/v3.9/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166" SOURCE_DIR="cmake-$portVersion" diff --git a/dev-util/cmake/patches/cmake-3.15.3.patchset b/dev-util/cmake/patches/cmake-3.15.3.patchset index b6ecbbae8..c9d7666d4 100644 --- a/dev-util/cmake/patches/cmake-3.15.3.patchset +++ b/dev-util/cmake/patches/cmake-3.15.3.patchset @@ -129,38 +129,3 @@ index 38fa32b..3754c2f 100755 -- 2.21.0 - -From d69150db539e8d6d50d6c171361880d3e354ac14 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 7 Sep 2019 23:46:47 +0200 -Subject: bootstrap uses cmlibuv - - -diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c -index 5cb3ad0..7c6fd5e 100644 ---- a/Utilities/cmlibuv/src/unix/core.c -+++ b/Utilities/cmlibuv/src/unix/core.c -@@ -1351,7 +1351,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) { - return UV_EINVAL; - - errno = 0; -+#ifndef __HAIKU__ - r = getpriority(PRIO_PROCESS, (int) pid); -+#endif - - if (r == -1 && errno != 0) - return UV__ERR(errno); -@@ -1365,8 +1367,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.21.0 -