cmake: bump version.

dev-util/cmake/cmake-3.16.0.recipe

@@ -8,8 +8,8 @@ HOMEPAGE="https://cmake.org/"
 COPYRIGHT="2002-2019 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
 REVISION="1"
-SOURCE_URI="https://cmake.org/files/v3.15/cmake-$portVersion.tar.gz"
+SOURCE_URI="https://cmake.org/files/v3.16/cmake-$portVersion.tar.gz"
-CHECKSUM_SHA256="fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4"
+CHECKSUM_SHA256="6da56556c63cab6e9a3e1656e8763ed4a841ac9859fefb63cbe79472e67e8c5f"
 SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 

dev-util/cmake/patches/cmake-3.16.0.patchset

@@ -1,25 +1,25 @@
-From 35eb5e86d189f0f349192402a475c13e5deadbd8 Mon Sep 17 00:00:00 2001
+From 0bbd9a38b11050f32cf2fca8af4f8341344ca63e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 21 Nov 2015 22:02:38 +0000
 Subject: Haiku provides elf.h now.
 
 
 diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
-index 2226463..bce4aba 100644
+index 5976b2f..1dd659a 100644
 --- a/Source/cmELF.cxx
 +++ b/Source/cmELF.cxx
-@@ -16,28 +16,20 @@
+@@ -21,28 +21,20 @@
  #if defined(__OpenBSD__)
  #  include <elf_abi.h>
  #  include <stdint.h>
 -#elif defined(__HAIKU__)
 -#  include <elf32.h>
 -#  include <elf64.h>
--typedef struct Elf32_Ehdr Elf32_Ehdr;
+-using Elf32_Ehdr = struct Elf32_Ehdr;
--typedef struct Elf32_Shdr Elf32_Shdr;
+-using Elf32_Shdr = struct Elf32_Shdr;
--typedef struct Elf32_Sym Elf32_Sym;
+-using Elf32_Sym = struct Elf32_Sym;
--typedef struct Elf32_Rel Elf32_Rel;
+-using Elf32_Rel = struct Elf32_Rel;
--typedef struct Elf32_Rela Elf32_Rela;
+-using Elf32_Rela = struct Elf32_Rela;
 +#else
 +#  include <elf.h>
 +# ifndef ELFMAG0
@@ -48,10 +48,10 @@ index 2226463..bce4aba 100644
  #if defined(__sun)
  #  include <sys/link.h> // For dynamic section information
 -- 
-2.23.0
+2.24.0
 
 
-From 1370a465be1f5b9324d67c1b77b96e9b063600f5 Mon Sep 17 00:00:00 2001
+From 572ea587e8c345177ca6804bf73148278a8a3735 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sat, 24 Mar 2018 14:19:43 +0100
 Subject: Fix search path for Lua headers.
@@ -71,52 +71,20 @@ index 283a3eb..8fd73f2 100644
    ~/Library/Frameworks
    /Library/Frameworks
 -- 
-2.23.0
+2.24.0
 
 
-From 11792581f69363e5f9e0c0ca28ac01961cd22b28 Mon Sep 17 00:00:00 2001
+From 382e246c35e29e60d3caa7583515f5e57bf65095 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 7 Sep 2019 17:04:46 +0200
-Subject: unsupported features.
-
-
-diff --git a/Utilities/cmlibuv/src/unix/core.c b/Utilities/cmlibuv/src/unix/core.c
-index a8d6adb..5cb3ad0 100644
---- a/Utilities/cmlibuv/src/unix/core.c
-+++ b/Utilities/cmlibuv/src/unix/core.c
-@@ -562,7 +562,7 @@ int uv__nonblock_ioctl(int fd, int set) {
- }
- 
- 
--#if !defined(__CYGWIN__) && !defined(__MSYS__)
-+#if !defined(__CYGWIN__) && !defined(__MSYS__) && !defined(__HAIKU__)
- int uv__cloexec_ioctl(int fd, int set) {
-   int r;
- 
-@@ -929,7 +929,7 @@ int uv_getrusage(uv_rusage_t* rusage) {
-   rusage->ru_stime.tv_sec = usage.ru_stime.tv_sec;
-   rusage->ru_stime.tv_usec = usage.ru_stime.tv_usec;
- 
--#if !defined(__MVS__)
-+#if !defined(__MVS__) && !defined(__HAIKU__)
-   rusage->ru_maxrss = usage.ru_maxrss;
-   rusage->ru_ixrss = usage.ru_ixrss;
-   rusage->ru_idrss = usage.ru_idrss;
--- 
-2.23.0
-
-
-From d6489ab197ac2695121008fcf3dce1aade85727b Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 7 Sep 2019 17:29:56 +0200
 Subject: links against libnetwork
 
 
 diff --git a/bootstrap b/bootstrap
-index 38fa32b..3754c2f 100755
+index 883b165..e6d5dfc 100755
 --- a/bootstrap
 +++ b/bootstrap
-@@ -1397,6 +1397,9 @@ else
+@@ -1478,6 +1478,9 @@ else
        uv_c_flags="${uv_c_flags} -D__EXTENSIONS__ -D_XOPEN_SOURCE=600"
        libs="${libs} -lkstat -lnsl -lsendfile -lsocket -lrt"
        ;;
@@ -127,20 +95,20 @@ index 38fa32b..3754c2f 100755
  fi
  uv_c_flags="${uv_c_flags} `cmake_escape "-I${cmake_source_dir}/Utilities/cmlibuv/include"`"
 -- 
-2.23.0
+2.24.0
 
 
-From 69e205cdcc54cb0588461e0a8a4336c0932a075b Mon Sep 17 00:00:00 2001
+From adb7f8b33e9ae223b0643239fb5134cccb2b85ef Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 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
+index cf7dea0..5d23bf2 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) {
+@@ -1377,7 +1377,9 @@ int uv_os_getpriority(uv_pid_t pid, int* priority) {
      return UV_EINVAL;
  
    errno = 0;
@@ -150,7 +118,7 @@ index 5cb3ad0..7c6fd5e 100644
  
    if (r == -1 && errno != 0)
      return UV__ERR(errno);
-@@ -1365,8 +1367,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
+@@ -1391,8 +1393,10 @@ int uv_os_setpriority(uv_pid_t pid, int priority) {
    if (priority < UV_PRIORITY_HIGHEST || priority > UV_PRIORITY_LOW)
      return UV_EINVAL;
  
@@ -162,10 +130,10 @@ index 5cb3ad0..7c6fd5e 100644
    return 0;
  }
 -- 
-2.23.0
+2.24.0
 
 
-From 40f7b0c51323ab968d5b5c34484e2d4143d628bd Mon Sep 17 00:00:00 2001
+From b48761aa83b8f815f54647a99d3eb11a0b64f4ac Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 21 Sep 2019 15:30:44 +0200
 Subject: also detect secondary arch with clang.
@@ -187,5 +155,5 @@ index 7e0af61..4129c00 100644
  if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
    set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
 -- 
-2.23.0
+2.24.0