diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-08 13:18:17 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-07-08 13:11:12 +0200 |
| commit | 2a0feee39134d45699f08e45057e5ca832938ba1 (patch) | |
| tree | bb42cebdc5f70b40eda0078ef4faa5417bcae0e8 /main/cmake | |
| parent | 18d6aeb55d768dd3405059c12a15528d05c4bdd6 (diff) | |
main/libuv: upgrade to 1.21.0 and rebuild dependent packages
Diffstat (limited to 'main/cmake')
| -rw-r--r-- | main/cmake/APKBUILD | 9 | ||||
| -rw-r--r-- | main/cmake/libuv-1.21-compat.patch | 26 |
2 files changed, 32 insertions, 3 deletions
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index e6ddea0e9e8..cef461dd041 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake pkgver=3.11.4 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform, open-source make system" url="http://www.cmake.org" arch="all" @@ -18,7 +18,9 @@ case $pkgver in *.*.*) _v=v${pkgver%.*};; esac -source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz" +source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz + libuv-1.21-compat.patch + " builddir="$srcdir/$pkgname-$pkgver" _parallel_opt() { @@ -68,4 +70,5 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/ } -sha512sums="c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 cmake-3.11.4.tar.gz" +sha512sums="c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 cmake-3.11.4.tar.gz +38c2f594dad56cdfb24a9a272f04ccdad0151296c414c306cb552e71ac14b1c2480702620127f5af5b43875af1be25f7679abfabb3c59e8d6af110ccac4aa7d0 libuv-1.21-compat.patch" diff --git a/main/cmake/libuv-1.21-compat.patch b/main/cmake/libuv-1.21-compat.patch new file mode 100644 index 00000000000..df203b62fe7 --- /dev/null +++ b/main/cmake/libuv-1.21-compat.patch @@ -0,0 +1,26 @@ +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() |