diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2021-07-15 07:56:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2021-07-15 10:32:19 +0000 |
| commit | 661c3dd489345de6e6d771b846d81858f07c8524 (patch) | |
| tree | 6584bc676ad00a92bd66dbcd44e4cdff0d0fa453 /main | |
| parent | 7edeb0b576a7703df0646c7f0029767f19399732 (diff) | |
| download | aports-661c3dd489345de6e6d771b846d81858f07c8524.zip | |
main/cmake: upgrade to 3.21.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/cmake/APKBUILD | 6 | ||||
| -rw-r--r-- | main/cmake/patch-adjust-lib64.patch | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index 9bb39d0d1d7..d9fcc22f209 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=3.20.5 +pkgver=3.21.0 pkgrel=0 pkgdesc="Cross-platform, open-source make system" url="https://www.cmake.org/" @@ -19,7 +19,6 @@ case $pkgver in esac source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz - patch-adjust-lib64.patch " _parallel_opt() { @@ -58,6 +57,5 @@ package() { make DESTDIR="$pkgdir" install } sha512sums=" -4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 cmake-3.20.5.tar.gz -26e5886ffa30c801b58eaa966c410f71e219914feee446d14c42d75c0a17202a2e168f7eab40f472aa594fd2a1e8572274ec6c0a8207fd5edb75f994479344eb patch-adjust-lib64.patch +b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc cmake-3.21.0.tar.gz " diff --git a/main/cmake/patch-adjust-lib64.patch b/main/cmake/patch-adjust-lib64.patch deleted file mode 100644 index 1dfd619ea67..00000000000 --- a/main/cmake/patch-adjust-lib64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake -index f7d8c36a26..d81033ca90 100644 ---- a/Modules/GNUInstallDirs.cmake -+++ b/Modules/GNUInstallDirs.cmake -@@ -239,6 +239,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set - endif() - if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" - AND NOT CMAKE_CROSSCOMPILING -+ AND NOT EXISTS "/etc/alpine-release" - AND NOT EXISTS "/etc/arch-release") - if (EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) |