From 18f503fccc365827c1c433f7f5a1c5acd7964c6b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Mar 2015 12:14:24 +0000 Subject: main/cmake: upgrade to 3.2.1 --- main/cmake/APKBUILD | 13 +++++++++---- main/cmake/musl-header-fixes.patch | 13 +++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 main/cmake/musl-header-fixes.patch diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index 4c14979d16..ea4ce1b5e2 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=cmake -pkgver=3.1.3 +pkgver=3.2.1 pkgrel=0 pkgdesc="CMake is a cross-platform open-source make system" url="http://www.cmake.org" @@ -16,6 +16,7 @@ case $pkgver in esac source="http://www.cmake.org/files/$_v/cmake-${pkgver}.tar.gz + musl-header-fixes.patch " _builddir="$srcdir/$pkgname-$pkgver" @@ -46,6 +47,7 @@ build() { --datadir=/share/$pkgname \ --docdir=/share/doc/$pkgname \ --system-libs \ + --no-system-jsoncpp \ $(parallel_opt) make || return 1 @@ -56,6 +58,9 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="5697a77503bb5636f4b4057dcc02aa32 cmake-3.1.3.tar.gz" -sha256sums="45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz" -sha512sums="348bed66dd23a22e2fc04d9c88f26bd61d110bfae80dfb1734be668d57c9bc58fe27d3f5274e40ab2b5185185b2a1e7b90721c1fe71e4e5d15ac598c840a896b cmake-3.1.3.tar.gz" +md5sums="63f436aa19b5efc37017759c8d3953ca cmake-3.2.1.tar.gz +500d40f006182e7f4e3e594347882fdf musl-header-fixes.patch" +sha256sums="759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c cmake-3.2.1.tar.gz +7169e21d649b35c031a615986ebc559d772d40667506ce495cbc51f828825ae8 musl-header-fixes.patch" +sha512sums="b405a81503ff92629a74ec0510d55cb12499ee4c44e83896242119550cb6a53c7eb3ebf3caee913c0a89d284f976d2369e978be3f775bacc0e570a89a217042f cmake-3.2.1.tar.gz +36ec0e51b4b1f00f8d7439d3e5a39ee8882704f69ec1ca901010ffba4914e7949aefafdb6698c28b966d5bccfa209aca993c228a37189ced047203d02644127c musl-header-fixes.patch" diff --git a/main/cmake/musl-header-fixes.patch b/main/cmake/musl-header-fixes.patch new file mode 100644 index 0000000000..edbdc270e3 --- /dev/null +++ b/main/cmake/musl-header-fixes.patch @@ -0,0 +1,13 @@ +mode_t needs sys/stat.h + +--- ./Source/cmStandardIncludes.h.orig ++++ ./Source/cmStandardIncludes.h +@@ -74,6 +74,8 @@ + + #if defined( _MSC_VER ) + typedef unsigned short mode_t; ++#else ++#include + #endif + + // use this class to shrink the size of symbols in .o files -- cgit v1.2.3