diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-18 08:35:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-18 08:35:36 +0000 |
| commit | de288479708c697bc98f07ddd7bed8e7aa15a5c7 (patch) | |
| tree | 9b7597fec6916636744cbb88dd72ad9f353c1a9f /main/cmake | |
| parent | ab17ebc5ee95aaf5dd80dcd83e9ad004434ce475 (diff) | |
| download | aports-de288479708c697bc98f07ddd7bed8e7aa15a5c7.tar.bz2 aports-de288479708c697bc98f07ddd7bed8e7aa15a5c7.tar.xz | |
main/cmake: upgrade to 3.12.0
Diffstat (limited to 'main/cmake')
| -rw-r--r-- | main/cmake/APKBUILD | 10 | ||||
| -rw-r--r-- | main/cmake/libuv-1.21-compat.patch | 26 |
2 files changed, 4 insertions, 32 deletions
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index cef461dd04..fdd57b9bfa 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=3.11.4 -pkgrel=1 +pkgver=3.12.0 +pkgrel=0 pkgdesc="Cross-platform, open-source make system" url="http://www.cmake.org" arch="all" @@ -18,8 +18,7 @@ case $pkgver in *.*.*) _v=v${pkgver%.*};; esac -source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz - libuv-1.21-compat.patch +source="https://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz " builddir="$srcdir/$pkgname-$pkgver" @@ -70,5 +69,4 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/ } -sha512sums="c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 cmake-3.11.4.tar.gz -38c2f594dad56cdfb24a9a272f04ccdad0151296c414c306cb552e71ac14b1c2480702620127f5af5b43875af1be25f7679abfabb3c59e8d6af110ccac4aa7d0 libuv-1.21-compat.patch" +sha512sums="e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab cmake-3.12.0.tar.gz" diff --git a/main/cmake/libuv-1.21-compat.patch b/main/cmake/libuv-1.21-compat.patch deleted file mode 100644 index df203b62fe..0000000000 --- a/main/cmake/libuv-1.21-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 889033b5c6847cf1f7bd789384405d59dc333bf6 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Sat, 23 Jun 2018 20:30:07 +0200 -Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection - -Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. -Make FindLibUV aware of the file's new location for configuration to work. - -Patch-Source: https://github.com/Kitware/CMake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6 ---- - Source/Modules/FindLibUV.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake -index ba13d75f8be..0554d62c23b 100644 ---- a/Source/Modules/FindLibUV.cmake -+++ b/Source/Modules/FindLibUV.cmake -@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR) - set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+") - if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") -+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h") -+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - else() |