From 25ad12949ba3447b27c61f8e9084c9bce8649e04 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 18 Mar 2016 16:01:27 +0100 Subject: [PATCH] cmake: update to 3.5.0. --- srcpkgs/cmake/patches/musl-header-fixes.patch | 13 ------------- srcpkgs/cmake/template | 18 ++++++++---------- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/cmake/patches/musl-header-fixes.patch diff --git a/srcpkgs/cmake/patches/musl-header-fixes.patch b/srcpkgs/cmake/patches/musl-header-fixes.patch deleted file mode 100644 index 9a155981e6e..00000000000 --- a/srcpkgs/cmake/patches/musl-header-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 1198928ded2..346d3140c75 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,7 +1,7 @@ # Template file for 'cmake' pkgname=cmake -version=3.2.3 -revision=2 +version=3.5.0 +revision=1 build_style=configure makedepends="zlib-devel bzip2-devel expat-devel libcurl-devel ncurses-devel libarchive-devel" short_desc="Cross-platform, open-source build system" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="LGPL-2.1, 3-clause-BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v${version%.*}/$pkgname-$version.tar.gz" -checksum=a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 +checksum=92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa if [ "$CROSS_BUILD" ]; then # XXX ugly :-) @@ -19,10 +19,7 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" -DCMAKE_USE_SYSTEM_LIBARCHIVE=1" configure_args+=" -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1" configure_args+=" -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1" - configure_args+=" -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DCMAKE_USE_SYSTEM_LIBFORM=1" - configure_args+=" -DHAVE_GLIBC_STRERROR_R=0 -DHAVE_POSIX_STRERROR_R=1" - configure_args+=" -DHAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT=0 -DHAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT=0" - configure_args+=" -DHAVE_POLL_FINE=1 -DKWSYS_CHAR_IS_SIGNED=1 -DKWSYS_LFS_WORKS=1" + configure_args+=" -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1" else build_style=configure configure_args="--prefix=/usr --mandir=/share/man" @@ -30,7 +27,8 @@ else fi post_install() { - if [ -d ${DESTDIR}/usr/doc ]; then - mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share - fi + rm -rf ${DESTDIR}/usr/share/doc/cmake + vlicense Copyright.txt + vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt + vlicense Utilities/cmcompress/Copyright.txt cmcompress-Copyright.txt }