jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cmake: update to 3.19.1

Browse source 
- build with system jsoncpp, too
This commit is contained in:
Đoàn Trần Công Danh 2020-12-05 12:15:44 +07:00
parent 7e9a735ed1
commit 4c978d2fd1
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
srcpkgs/cmake/patches/musl-test.patch Normal file
View file

@ -0,0 +1,15 @@
--- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
@@ -33,9 +33,9 @@
[[librunpath_parent_unresolved\.so]]
[[librunpath_unresolved\.so]]
)
-check_contents(deps/udeps1.txt "^${_check}$")
-check_contents(deps/udeps2.txt "^${_check}$")
-check_contents(deps/udeps3.txt "^${_check}$")
+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
set(_check
"^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
)

21
srcpkgs/cmake/template
View file

@ -1,26 +1,21 @@
# Template file for 'cmake' # Template file for 'cmake'
pkgname=cmake pkgname=cmake
version=3.19.0 version=3.19.1
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
-DCMAKE_BUILD_TYPE=None -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
-DCMAKE_USE_SYSTEM_LIBARCHIVE=1
-DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1
-DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1
-DCMAKE_USE_SYSTEM_LIBUV=1 -DCMAKE_USE_SYSTEM_LIBRHASH=1
-DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1"
make_check_target=test make_check_target=test
hostmakedepends="cmake-bootstrap gcc-fortran" hostmakedepends="cmake-bootstrap gcc-fortran"
makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
ncurses-devel rhash-devel" ncurses-devel rhash-devel jsoncpp-devel"
checkdepends="pax pkg-config" checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system" short_desc="Cross-platform, open-source build system"
maintainer="Nathan Owens <ndowens04@gmail.com>" maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause" license="BSD-3-Clause, ICU"
homepage="https://www.cmake.org" homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 checksum=1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba
pre_check() { pre_check() {
# use ctest of this build instead of requirig cmake to test cmake... # use ctest of this build instead of requirig cmake to test cmake...
@ -31,7 +26,9 @@ pre_check() {
post_install() { post_install() {
rm -rf ${DESTDIR}/usr/share/doc/cmake rm -rf ${DESTDIR}/usr/share/doc/cmake
sed -n -e '/Copyright/,/authorization[.]/p' \
Source/CursesDialog/form/fld_arg.c >fld.LICENSE
vlicense fld.LICENSE
vlicense Copyright.txt vlicense Copyright.txt
vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
vlicense Utilities/cmzlib/Copyright.txt cmzlib-Copyright.txt
} }