snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

cmake: update to 3.27.2.

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2023-08-17 18:25:47 +07:00 • committed by Đoàn Trần Công Danh
parent 6b9c9c7dfa
commit b6d9023b57
11 changed files with 93 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/cmake-gui Symbolic link
View file

@ -0,0 +1 @@
cmake

1
srcpkgs/cmake-gui/patches
View file

@ -1 +0,0 @@
../cmake/patches

40
srcpkgs/cmake-gui/template
View file

@ -1,40 +0,0 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
version=3.26.4
revision=3
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
-DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man
-DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
hostmakedepends="qt6-base python3-Sphinx qt6-tools"
makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
ncurses-devel qt6-base-devel rhash-devel qt6-tools-devel"
depends="desktop-file-utils shared-mime-info cmake>=${version}"
checkdepends="pax pkg-config git"
short_desc="Cross-platform, open-source build system - Qt GUI"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
checksum=313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208
do_check() {
cd build
./bin/ctest
}
do_install() {
# We are only interested in cmake-gui.
vbin build/bin/cmake-gui
vman build/Utilities/Sphinx/man/cmake-gui.1
for res in 32 64 128 ; do
vinstall Source/QtDialog/CMakeSetup${res}.png 0644 \
usr/share/icons/hicolor/${res}x${res}/apps/
done
vinstall Source/QtDialog/cmakecache.xml 0644 usr/share/mime
vinstall Source/QtDialog/cmake-gui.desktop 0644 usr/share/applications
vlicense Copyright.txt
}

1
srcpkgs/cmake-gui/update
View file

@ -1 +0,0 @@
../cmake/update

4
srcpkgs/cmake/patches/ignore-crape-compiler-test.patch
View file

@ -1,8 +1,6 @@
diff --git a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
index dcdc7f1b96..37e13b6c5c 100644
--- a/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
+++ b/Tests/RunCMake/ParseImplicitLinkInfo/ParseImplicitLinkInfo.cmake
@@ -11,7 +11,7 @@ project(Minimal NONE)
@@ -8,7 +8,7 @@
set(targets
aix-C-XL-13.1.3 aix-CXX-XL-13.1.3
aix-C-XLClang-16.1.0.1 aix-CXX-XLClang-16.1.0.1

14
srcpkgs/cmake/patches/linux-gate.patch
View file

@ -1,14 +0,0 @@
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8229
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 0ba35b6b79..0cd49ab4ba 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -730,7 +730,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
if(gp_tool MATCHES "ldd$")
set(gp_cmd_args "")
- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$")
+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)

16
srcpkgs/cmake/patches/musl-test.patch
View file

@ -1,6 +1,6 @@
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
@@ -33,9 +33,9 @@
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake
@@ -15,9 +15,9 @@ set(_check
[[librunpath_parent_unresolved\.so]]
[[librunpath_unresolved\.so]]
)
@ -13,3 +13,13 @@
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$"
)
--- a/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/RunCMakeTest.cmake
@@ -65,7 +65,6 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "
if(NOT CMake_COMPILER_FORCES_NEW_DTAGS)
run_install_test(linux)
- run_install_test(linux-parent-rpath-propagation)
run_install_test(file-filter)
endif()
run_install_test(linux-unresolved)

23
srcpkgs/cmake/patches/nlohmann_json.patch Normal file
View file

@ -0,0 +1,23 @@
--- a/Tests/CMakeLib/testDebuggerNamedPipe.cxx
+++ b/Tests/CMakeLib/testDebuggerNamedPipe.cxx
@@ -180,13 +180,13 @@ int runTest(int argc, char* argv[])
auto debuggerResponse = debuggerResponseStream.str();
std::vector<std::string> expectedResponses = {
- R"("event" : "initialized".*"type" : "event")",
- R"("command" : "launch".*"success" : true.*"type" : "response")",
- R"("command" : "configurationDone".*"success" : true.*"type" : "response")",
- R"("reason" : "started".*"threadId" : 1.*"event" : "thread".*"type" : "event")",
- R"("reason" : "exited".*"threadId" : 1.*"event" : "thread".*"type" : "event")",
- R"("exitCode" : 0.*"event" : "exited".*"type" : "event")",
- R"("command" : "disconnect".*"success" : true.*"type" : "response")"
+ R"("event" *: *"initialized".*"type" *: *"event")",
+ R"("command" *: *"launch".*"success" *: *true.*"type" *: *"response")",
+ R"("command" *: *"configurationDone".*"success" *: *true.*"type" *: *"response")",
+ R"("reason" *: *"started".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")",
+ R"("reason" *: *"exited".*"threadId" *: *1.*"event" *: *"thread".*"type" *: *"event")",
+ R"("exitCode" *: *0.*"event" *: *"exited".*"type" *: *"event")",
+ R"("command" *: *"disconnect".*"success" *: *true.*"type" *: *"response")"
};
for (auto& regexString : expectedResponses) {

26
srcpkgs/cmake/patches/no-license.patch Normal file
View file

@ -0,0 +1,26 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -522,9 +522,6 @@ if(BUILD_TESTING)
endif()
if(NOT CMake_TEST_EXTERNAL_CMAKE)
- # Install license file as it requires.
- install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR})
-
# Install script directories.
install(
DIRECTORY Help Modules Templates
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -615,11 +615,6 @@ if(KWSYS_INSTALL_DOC_DIR)
COMPONENT ${KWSYS_INSTALL_COMPONENT_NAME_RUNTIME}
)
endif()
-
- # Install the license under the documentation directory.
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt
- DESTINATION ${KWSYS_INSTALL_DOC_DIR}/${KWSYS_NAMESPACE}
- ${KWSYS_INSTALL_LICENSE_OPTIONS})
endif()
#-----------------------------------------------------------------------------

8
srcpkgs/cmake/patches/no-run-cmake-bootstrap.patch
View file

@ -1,9 +1,7 @@
We will run cmake ourselves with our flags
Index: cmake-3.20.3/bootstrap
===================================================================
--- cmake-3.20.3.orig/bootstrap
+++ cmake-3.20.3/bootstrap
@@ -1968,6 +1968,7 @@ export CFLAGS
--- a/bootstrap
+++ b/bootstrap
@@ -2076,6 +2076,7 @@ export CFLAGS
export CXXFLAGS
export LDFLAGS

57
srcpkgs/cmake/template
View file

@ -1,58 +1,53 @@
# Template file for 'cmake'
pkgname=cmake
version=3.26.4
revision=3
version=3.27.2
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
-DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man
-DBUILD_CursesDialog=ON -DBUILD_QtDialog=ON
-DCMAKE_SKIP_BOOTSTRAP_TEST=1 -DCMAKE_SKIP_RPATH=1
-DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
hostmakedepends="gcc-fortran python3-Sphinx"
makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
ncurses-devel rhash-devel jsoncpp-devel"
hostmakedepends="gcc-fortran python3-Sphinx qt6-base qt6-tools"
makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel cppdap-devel
ncurses-devel rhash-devel jsoncpp-devel qt6-base-devel qt6-tools-devel"
checkdepends="pax pkg-config git"
short_desc="Cross-platform, open-source build system"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause, ICU"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
checksum=313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208
replaces="cmake-bootstrap>=0"
checksum=798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211
if [ "$XBPS_TARGET_LIBC" = musl ]; then
configure_args+=" -DCMake_NO_SELF_BACKTRACE=1"
fi
pre_configure() {
local f
mkdir -p build
cd build
CC=$CC_FOR_BUILD CFLAGS="$CFLAGS_FOR_BUILD" \
CXX=$CXX_FOR_BUILD CXXFLAGS="$CXXFLAGS_FOR_BUILD" \
LD=$LD_FOR_BUILD LDFLAGS="$LDFLAGS_FOR_BUILD" \
../bootstrap --no-system-libs \
--generator=Ninja \
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}
# Make sure build directory is clean
for f in *; do
if [ "$f" != Bootstrap.cmk ]; then
return 1
fi
done
cd ${wrksrc}
PATH="${wrksrc}/build/Bootstrap.cmk:$PATH"
}
do_check() {
cd build
./bin/ctest
}
post_install() {
rm -rf ${DESTDIR}/usr/share/doc/cmake
# No license would be installed
# or something were bundled without our knowledge
test ! -d ${DESTDIR}/usr/share/doc
sed -n -e '/Copyright/,/authorization[.]/p' \
Source/CursesDialog/form/fld_arg.c >fld.LICENSE
vlicense fld.LICENSE
Source/CursesDialog/form/fld_arg.c >fld.license
vlicense fld.license
sed -e '/\$FreeBSD\$/q' Utilities/cmelf/elf_common.h >elf.license
vlicense elf.license
vlicense Copyright.txt
vlicense Utilities/KWIML/Copyright.txt KWIML-Copyright.txt
}
cmake-gui_package() {
depends="desktop-file-utils shared-mime-info cmake>=${version}"
pkg_install() {
vmove usr/bin/cmake-gui
vmove usr/share/man/man1/cmake-gui.1
vmove usr/share/applications
vmove usr/share/icons
vmove usr/share/mime
}
}