* [PR PATCH] [NoMerge] cmake: update to 3.19.0
@ 2020-11-21 0:25 ndowens
2020-11-21 0:30 ` [PR REVIEW] " sgn
` (21 more replies)
0 siblings, 22 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10565 bytes --]
From e3eb6e4bf8bed312aa14a0789140548b83f54c52 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
srcpkgs/cmake-gui/template | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..3f468f63e1d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,19 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+ # TRY_RUN fails if being cross-built
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
do_install() {
# We are only interested in cmake-gui.
From f0d73cfbbe048b2e8760b0151e9d901a4f9a87a3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
srcpkgs/cmake/template | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..d450b43e362 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,21 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 07962adfdcdd2c423cc9ced768c382fc8bb79d55 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
.../0001-Fix-undefined-CMAKE_DOC_DIR.patch | 27 ++++
.../patches/only-want-half-baked-cmake.patch | 122 ------------------
srcpkgs/cmake-bootstrap/template | 10 +-
3 files changed, 34 insertions(+), 125 deletions(-)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
delete mode 100644 srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..44415f2990f
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 9799af604ee6ba5461a5d879a694994fed3a72d2 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:17:05 -0600
+Subject: [PATCH] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 97440d2..f92060d 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
deleted file mode 100644
index 07279cf6887..00000000000
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
---- Source/cmSystemTools.cxx
-+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- #ifdef CMAKE_BOOTSTRAP
- // The bootstrap cmake does not provide the other tools,
- // so use the directory where they are about to be built.
-- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
- #endif
- cmSystemToolsCTestCommand =
- cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- cmSystemToolsCMClDepsCommand.clear();
- }
-
--#ifndef CMAKE_BOOTSTRAP
- // Install tree has
- // - "<prefix><CMAKE_BIN_DIR>/cmake"
- // - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
- }
- }
--#else
-- // Bootstrap build knows its source.
-- cmSystemToolsCMakeRoot = CMAKE_BOOTSTRAP_SOURCE_DIR;
--#endif
- }
-
- std::string const& cmSystemTools::GetCMakeCommand()
-diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
---- bootstrap
-+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
- echo "Test failed to produce executable"
- return 2
- fi
-- ./${TMPFILE}
-- RES=$?
-- rm -f "${TMPFILE}"
-- if test "${RES}" -ne "0"; then
-- echo "Test produced non-zero return code"
-- return 3
-- fi
-- echo "Test succeeded"
- return 0
- }
-
-@@ -839,13 +831,6 @@ cmake_try_make ()
- echo "${COMPILER} does not produce output"
- return 2
- fi
-- ./test
-- RES=$?
-- rm -f "test"
-- if test "${RES}" -ne "0"; then
-- echo "${MAKE_PROC} produces strange executable"
-- return 3
-- fi
- echo "${MAKE_PROC} works"
- return 0
- }
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
- cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
- cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
- cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
--cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insalled\""
--cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\""
-+cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"$cmake_bin_dir\""
-+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
- cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
-
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
- cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
- fi
- )
--
--echo "---------------------------------------------"
--
--# Run make to build bootstrap cmake
--if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
--else
-- ${cmake_make_processor}
--fi
--RES=$?
--if test "${RES}" -ne "0"; then
-- cmake_error 9 "Problem while running ${cmake_make_processor}"
--fi
--cd "${cmake_binary_dir}"
--
--# Set C, CXX, and MAKE environment variables, so that real real cmake will be
--# build with same compiler and make
--CC="${cmake_c_compiler}"
--CXX="${cmake_cxx_compiler}"
--MAKE="${cmake_make_processor}"
--export CC
--export CXX
--export MAKE
--export CFLAGS
--export CXXFLAGS
--export LDFLAGS
--
--# Run bootstrap CMake to configure real CMake
--cmake_options="-DCMAKE_BOOTSTRAP=1"
--if test -n "${cmake_verbose}"; then
-- cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
--fi
--"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@"
--RES=$?
--if test "${RES}" -ne "0"; then
-- cmake_error 11 "Problem while running initial CMake"
--fi
--
--echo "---------------------------------------------"
--
--# And we are done. Now just run make
--echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6163e9ca1c7 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -32,6 +32,10 @@ post_patch() {
rm -rf Utilities/cmnghttp2
rm -rf Utilities/cmzlib
rm -rf Utilities/cmzstd
+ # disable running of cmake in bootstrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap
}
do_check() {
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
@ 2020-11-21 0:30 ` sgn
2020-11-21 0:35 ` ndowens
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 0:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528037824
Comment:
Did you run the full bootstrap with this change?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
2020-11-21 0:30 ` [PR REVIEW] " sgn
@ 2020-11-21 0:35 ` ndowens
2020-11-21 0:40 ` ndowens
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528038767
Comment:
If it non-cross-build it builds fine; Currently I am trying to fix cross, then test cmake and cmake-gui against it.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
2020-11-21 0:30 ` [PR REVIEW] " sgn
2020-11-21 0:35 ` ndowens
@ 2020-11-21 0:40 ` ndowens
2020-11-21 0:40 ` sgn
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528038767
Comment:
If it non-cross-build it builds fine; Currently I am trying to fix cross, then test cmake and cmake-gui against it.
If it is being built using cross-built it for some reason can't find C compiler and log says C compiler is set to c++ compiler, which isn't correct. If I get C compiler fine, it gives c++ doesn't support c++11
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (2 preceding siblings ...)
2020-11-21 0:40 ` ndowens
@ 2020-11-21 0:40 ` sgn
2020-11-21 0:42 ` ndowens
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528039826
Comment:
Why does it have problem with cross build? The binaries should never run at all.
And why do you remove this patch (to C++ code).
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (3 preceding siblings ...)
2020-11-21 0:40 ` sgn
@ 2020-11-21 0:42 ` ndowens
2020-11-21 0:57 ` [PR PATCH] [Updated] " ndowens
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528040143
Comment:
Let me try and remake the patch since it fails to apply on this version
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (4 preceding siblings ...)
2020-11-21 0:42 ` ndowens
@ 2020-11-21 0:57 ` ndowens
2020-11-21 0:59 ` ndowens
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10693 bytes --]
From e3eb6e4bf8bed312aa14a0789140548b83f54c52 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
srcpkgs/cmake-gui/template | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..3f468f63e1d 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,19 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+ # TRY_RUN fails if being cross-built
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
do_install() {
# We are only interested in cmake-gui.
From f0d73cfbbe048b2e8760b0151e9d901a4f9a87a3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
srcpkgs/cmake/template | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..d450b43e362 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,21 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \
+ CMakeLists.txt
+ fi
+}
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 3a9927953df23def0aaf854098a34ae647fdca1e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 49 +++++++++++++------
.../0002-Fix-undefined-CMAKE_DOC_DIR.patch | 27 ++++++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 64 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5eb5347aa23 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: [PATCH 1/2] We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,6 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..fc144737353
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: [PATCH 2/2] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6cd85486c70 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (5 preceding siblings ...)
2020-11-21 0:57 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-21 0:59 ` ndowens
2020-11-21 1:08 ` ndowens
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10192 bytes --]
From 21f7bb71b59ce0f32a6bc8725ec9184ed6b96e5c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
srcpkgs/cmake-gui/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From b9def24bda56ad279a81b94cc2d4320b09265fa4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
srcpkgs/cmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 5b6149a96a56d6d1bee89cba30074fe88f23c38e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 49 +++++++++++++------
.../0002-Fix-undefined-CMAKE_DOC_DIR.patch | 27 ++++++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 64 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5eb5347aa23 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: [PATCH 1/2] We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,6 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..fc144737353
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: [PATCH 2/2] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6cd85486c70 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (6 preceding siblings ...)
2020-11-21 0:59 ` ndowens
@ 2020-11-21 1:08 ` ndowens
2020-11-21 1:14 ` ndowens
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 12414 bytes --]
From 213bd6e323b751c98f45b6a709ca8ceaaf9b3d64 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
.../0001-Fix-undefined-CMAKE_DOC_DIR.patch | 27 +++++++++++++++++++
srcpkgs/cmake-gui/template | 6 ++---
2 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/cmake-gui/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake-gui/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-gui/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..b35484fa310
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From b0c83fd3c83f450102529f3116f5be6d0c4c5a2f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
.../0001-Fix-undefined-CMAKE_DOC_DIR.patch | 27 +++++++++++++++++++
srcpkgs/cmake/template | 4 +--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..b35484fa310
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 6a0b8f2fd3d624bfb2050eac51cd6b70107d8d30 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 49 +++++++++++++------
.../0002-Fix-undefined-CMAKE_DOC_DIR.patch | 27 ++++++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 64 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5eb5347aa23 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: [PATCH 1/2] We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,6 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..fc144737353
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: [PATCH 2/2] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6cd85486c70 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (7 preceding siblings ...)
2020-11-21 1:08 ` ndowens
@ 2020-11-21 1:14 ` ndowens
2020-11-21 3:20 ` [PR PATCH] [Updated] " ndowens
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 1:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#issuecomment-731482291
Comment:
Work on it more after a little while or tomorrow
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (8 preceding siblings ...)
2020-11-21 1:14 ` ndowens
@ 2020-11-21 3:20 ` ndowens
2020-11-21 4:04 ` ndowens
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10192 bytes --]
From 6eaae89e99dda29b143a812fad06e27fb2f2bdd7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
srcpkgs/cmake-gui/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From 9480962ba6d0bd5835167acdf81d51d6e613ae37 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
srcpkgs/cmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 47e5c5356196a589e71c1983e4e570b2c1f656e0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 49 +++++++++++++------
.../0002-Fix-undefined-CMAKE_DOC_DIR.patch | 27 ++++++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 64 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5eb5347aa23 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: [PATCH 1/2] We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,6 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
new file mode 100644
index 00000000000..fc144737353
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-CMAKE_DOC_DIR.patch
@@ -0,0 +1,27 @@
+From 58b30bfd2dbb15c1409f4b450c133aa8ebd212c1 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:56:18 -0600
+Subject: [PATCH 2/2] Fix undefined CMAKE_DOC_DIR
+
+---
+ Source/cmSystemTools.cxx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..d4fd9bf 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -11,6 +11,10 @@
+ # define _XOPEN_SOURCE 700
+ #endif
+
++#ifndef CMAKE_DOC_DIR
++# define CMAKE_DOC_DIR /usr/share/doc
++#endif
++
+ #include "cmSystemTools.h"
+
+ #include <cmext/algorithm>
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..6cd85486c70 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk cmake_doc_dir=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (9 preceding siblings ...)
2020-11-21 3:20 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-21 4:04 ` ndowens
2020-11-21 4:47 ` ndowens
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 10269 bytes --]
From 6eaae89e99dda29b143a812fad06e27fb2f2bdd7 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
srcpkgs/cmake-gui/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From 9480962ba6d0bd5835167acdf81d51d6e613ae37 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
srcpkgs/cmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 8c3abefe3b44b3ebda8bf3175b6f7d5cf733edf0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 48 +++++++++++++------
.../0002-Fix-undefined-cmake_doc_dir.patch | 18 +++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 54 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5a7264cef82 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,5 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
new file mode 100644
index 00000000000..efbbfc41867
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
@@ -0,0 +1,18 @@
+Gives CMAKE_DOC_DIR undefined, this is half-baked cmake
+so don't truly need
+---
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..7c516d8 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ std::string const prefix =
+ exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR));
+ cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR);
+- if (cmSystemTools::FileExists(
+- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
+- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
+- }
+ }
+ if (cmSystemToolsCMakeRoot.empty() ||
+ !cmSystemTools::FileExists(
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..5f68785ad72 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (10 preceding siblings ...)
2020-11-21 4:04 ` ndowens
@ 2020-11-21 4:47 ` ndowens
2020-11-21 5:01 ` ndowens
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 4:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 13000 bytes --]
From a3f3d9537e438b39d82ea331e02af871eb51a640 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
.../patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake-gui/template | 12 ++++++---
2 files changed, 36 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..80fcef6b637 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,17 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+do_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ patch -Np0 -i 0001-Disable-try_run.patch
+ fi
+}
do_install() {
# We are only interested in cmake-gui.
From 82615290bb92b93d4bcd5a47397a3ca9dda36dc1 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
.../cmake/patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake/template | 10 +++++--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake/patches/0001-Disable-try_run.patch b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..a6b9fbc5d54 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,13 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
+
+do_patch() {
+ if [ "$CROSS_BUILD" ]; then
+ patch -Np0 -i 0001-Disable-try_run.patch
+ fi
+}
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 8b8f266645006b8c8c8b50690bf3db0f97290330 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 48 +++++++++++++------
.../0002-Fix-undefined-cmake_doc_dir.patch | 18 +++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 54 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5a7264cef82 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,5 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
new file mode 100644
index 00000000000..efbbfc41867
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
@@ -0,0 +1,18 @@
+Gives CMAKE_DOC_DIR undefined, this is half-baked cmake
+so don't truly need
+---
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..7c516d8 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ std::string const prefix =
+ exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR));
+ cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR);
+- if (cmSystemTools::FileExists(
+- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
+- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
+- }
+ }
+ if (cmSystemToolsCMakeRoot.empty() ||
+ !cmSystemTools::FileExists(
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..5f68785ad72 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (11 preceding siblings ...)
2020-11-21 4:47 ` ndowens
@ 2020-11-21 5:01 ` ndowens
2020-11-21 5:30 ` ndowens
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 12795 bytes --]
From 42d5c6b8ec2bac751f31aa232e67501629709f25 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
.../patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake-gui/template | 6 ++---
2 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From 02a74ba756e7d0a07ed30e4b9e0127fea6797487 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
.../cmake/patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake/template | 4 +--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake/patches/0001-Disable-try_run.patch b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 707c6ca730f53d838e3a6fb5a8b4e9ab5833aa06 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 48 +++++++++++++------
.../0002-Fix-undefined-cmake_doc_dir.patch | 18 +++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 54 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5a7264cef82 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,5 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
new file mode 100644
index 00000000000..efbbfc41867
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
@@ -0,0 +1,18 @@
+Gives CMAKE_DOC_DIR undefined, this is half-baked cmake
+so don't truly need
+---
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..7c516d8 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ std::string const prefix =
+ exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR));
+ cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR);
+- if (cmSystemTools::FileExists(
+- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
+- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
+- }
+ }
+ if (cmSystemToolsCMakeRoot.empty() ||
+ !cmSystemTools::FileExists(
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..5f68785ad72 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (12 preceding siblings ...)
2020-11-21 5:01 ` ndowens
@ 2020-11-21 5:30 ` ndowens
2020-11-21 5:38 ` [PR REVIEW] " sgn
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 5:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#issuecomment-731512001
Comment:
Had to write a patch to disable TRY_RUN or cross-builds will fail. Resulting cmake binary work as expected.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (13 preceding siblings ...)
2020-11-21 5:30 ` ndowens
@ 2020-11-21 5:38 ` sgn
2020-11-21 5:38 ` sgn
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 5:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528076317
Comment:
Too much noise in this patch! And you're not the author ;)
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (14 preceding siblings ...)
2020-11-21 5:38 ` [PR REVIEW] " sgn
@ 2020-11-21 5:38 ` sgn
2020-11-21 9:34 ` [PR REVIEW] " ndowens
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 5:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#issuecomment-731512732
Comment:
> Had to write a patch to disable TRY_RUN or cross-builds will fail. Resulting cmake binary work as expected.
Basically, rebase my patch?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (15 preceding siblings ...)
2020-11-21 5:38 ` sgn
@ 2020-11-21 9:34 ` ndowens
2020-11-21 9:34 ` ndowens
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 9:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528174193
Comment:
Ok well you can update cmake-bootstrap if you like
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (16 preceding siblings ...)
2020-11-21 9:34 ` [PR REVIEW] " ndowens
@ 2020-11-21 9:34 ` ndowens
2020-11-21 10:07 ` [PR REVIEW] " sgn
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 9:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#issuecomment-731554405
Comment:
> > Had to write a patch to disable TRY_RUN or cross-builds will fail. Resulting cmake binary work as expected.
>
> Basically, rebase my patch?
I wrote the smaller ones in cmake and cmake-gui
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (17 preceding siblings ...)
2020-11-21 9:34 ` ndowens
@ 2020-11-21 10:07 ` sgn
2020-11-21 10:08 ` sgn
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 10:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528076317
Comment:
Too much noise in this patch! And you're not the author ;)
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (18 preceding siblings ...)
2020-11-21 10:07 ` [PR REVIEW] " sgn
@ 2020-11-21 10:08 ` sgn
2020-11-21 10:08 ` sgn
2020-11-21 15:20 ` [PR PATCH] [Updated] " ndowens
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 10:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#discussion_r528174193
Comment:
Ok well you can update cmake-bootstrap if you like
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (19 preceding siblings ...)
2020-11-21 10:08 ` sgn
@ 2020-11-21 10:08 ` sgn
2020-11-21 15:20 ` [PR PATCH] [Updated] " ndowens
21 siblings, 0 replies; 23+ messages in thread
From: sgn @ 2020-11-21 10:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26544#issuecomment-731512732
Comment:
> Had to write a patch to disable TRY_RUN or cross-builds will fail. Resulting cmake binary work as expected.
Basically, rebase my patch?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] [NoMerge] cmake: update to 3.19.0
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
` (20 preceding siblings ...)
2020-11-21 10:08 ` sgn
@ 2020-11-21 15:20 ` ndowens
21 siblings, 0 replies; 23+ messages in thread
From: ndowens @ 2020-11-21 15:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages cmake
https://github.com/void-linux/void-packages/pull/26544
[NoMerge] cmake: update to 3.19.0
A patch file from https://github.com/void-linux/void-packages/pull/26544.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-26544.patch --]
[-- Type: text/x-diff, Size: 12795 bytes --]
From 7d84dd6432b8cc99d38408020e15120fab7db33c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:18:01 -0600
Subject: [PATCH 1/3] cmake-gui: update to 3.19.0
---
.../patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake-gui/template | 6 ++---
2 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 0dff4e8c853..6d4ad27031b 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
-version=3.18.4
+version=3.19.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,11 +17,11 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
depends="desktop-file-utils shared-mime-info"
checkdepends="pax pkg-config"
short_desc="Cross-platform, open-source build system - Qt GUI"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
do_install() {
# We are only interested in cmake-gui.
From c30d3e5d41dfeb60ed29408e07a3d0b197c8f5e5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 19 Nov 2020 19:02:23 -0600
Subject: [PATCH 2/3] cmake: update to 3.19.0
---
.../cmake/patches/0001-Disable-try_run.patch | 27 +++++++++++++++++++
srcpkgs/cmake/template | 4 +--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Disable-try_run.patch
diff --git a/srcpkgs/cmake/patches/0001-Disable-try_run.patch b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
new file mode 100644
index 00000000000..3e05af1a581
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Disable-try_run.patch
@@ -0,0 +1,27 @@
+From 544abc16419065c009361b9627f69665471cfb6d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 22:24:08 -0600
+Subject: [PATCH] Disable try_run
+
+If cross-building, try_run cannot run during
+cross-build so cause build to fail
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 2d860d4..c14a203 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -61,7 +61,7 @@ if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)
+ message(FATAL_ERROR "TRY_RUN not allowed with CMAKE_TRY_COMPILE_OSX_ARCHITECTURES=[${CMAKE_TRY_COMPILE_OSX_ARCHITECTURES}]")
+ else()
+- _TRY_RUN(${ARGV})
++ # _TRY_RUN(${ARGV})
+ endif()
+ endmacro()
+ endif()
+--
+2.29.2
+
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 0955f2595fa..24dc0785af9 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.18.4
+version=3.19.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -20,7 +20,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 198ab5dae8b718297fc83d0670d18d561419a781 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 20 Nov 2020 18:24:28 -0600
Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0
---
...001-We-only-want-a-half-baked-cmake.patch} | 48 +++++++++++++------
.../0002-Fix-undefined-cmake_doc_dir.patch | 18 +++++++
srcpkgs/cmake-bootstrap/template | 6 +--
3 files changed, 54 insertions(+), 18 deletions(-)
rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%)
create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
similarity index 73%
rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
index 07279cf6887..5a7264cef82 100644
--- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch
+++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch
@@ -1,17 +1,27 @@
+From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Fri, 20 Nov 2020 18:55:09 -0600
+Subject: We only want a half-baked-cmake
+
+---
+ Source/cmSystemTools.cxx | 7 +----
+ bootstrap | 67 ++--------------------------------------
+ 2 files changed, 3 insertions(+), 71 deletions(-)
+
diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
-index 1e78d36..a678122 100644
+index 97440d2..747cedc 100644
--- Source/cmSystemTools.cxx
+++ Source/cmSystemTools.cxx
-@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
#ifdef CMAKE_BOOTSTRAP
// The bootstrap cmake does not provide the other tools,
// so use the directory where they are about to be built.
- exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
-+ // this cmake will be installed to system directory
++ // this cmake will be installed to system directory
#endif
cmSystemToolsCTestCommand =
cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension());
-@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
cmSystemToolsCMClDepsCommand.clear();
}
@@ -19,8 +29,8 @@ index 1e78d36..a678122 100644
// Install tree has
// - "<prefix><CMAKE_BIN_DIR>/cmake"
// - "<prefix><CMAKE_DATA_DIR>"
-@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
- }
+@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html");
}
}
-#else
@@ -31,10 +41,10 @@ index 1e78d36..a678122 100644
std::string const& cmSystemTools::GetCMakeCommand()
diff --git bootstrap bootstrap
-index 04067dc..832a7ab 100755
+index 7ec3687..4500b6e 100755
--- bootstrap
+++ bootstrap
-@@ -812,14 +812,6 @@ cmake_try_run ()
+@@ -833,14 +833,6 @@ cmake_try_run ()
echo "Test failed to produce executable"
return 2
fi
@@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755
return 0
}
-@@ -839,13 +831,6 @@ cmake_try_make ()
+@@ -860,14 +852,6 @@ cmake_try_make ()
echo "${COMPILER} does not produce output"
return 2
fi
@@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755
- echo "${MAKE_PROC} produces strange executable"
- return 3
- fi
- echo "${MAKE_PROC} works"
+- echo "${MAKE_PROC} works"
return 0
}
-@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
+
+@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\""
cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400"
@@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755
+cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\""
cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH"
- if ${cmake_system_mingw}; then
-@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then
+ if test "${cmake_bootstrap_generator}" = "Ninja"; then
+@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then
cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
fi
)
@@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755
-echo "---------------------------------------------"
-
-# Run make to build bootstrap cmake
+-if test "${cmake_bootstrap_generator}" = "Ninja"; then
+- ninja_v=-v
+-else
+- ninja_v=
+-fi
-if test "x${cmake_parallel_make}" != "x"; then
-- ${cmake_make_processor} ${cmake_make_flags}
+- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v}
-else
-- ${cmake_make_processor}
+- ${cmake_make_processor} ${ninja_v}
-fi
-RES=$?
-if test "${RES}" -ne "0"; then
@@ -120,3 +136,5 @@ index 04067dc..832a7ab 100755
-
-# And we are done. Now just run make
-echo "CMake has bootstrapped. Now run ${cmake_make_processor}."
+--
+2.29.2
diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
new file mode 100644
index 00000000000..efbbfc41867
--- /dev/null
+++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch
@@ -0,0 +1,18 @@
+Gives CMAKE_DOC_DIR undefined, this is half-baked cmake
+so don't truly need
+---
+diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx
+index 747cedc..7c516d8 100644
+--- Source/cmSystemTools.cxx
++++ Source/cmSystemTools.cxx
+@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
+ std::string const prefix =
+ exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR));
+ cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR);
+- if (cmSystemTools::FileExists(
+- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) {
+- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html");
+- }
+ }
+ if (cmSystemToolsCMakeRoot.empty() ||
+ !cmSystemTools::FileExists(
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8ae4e76dce5..5f68785ad72 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'cmake-bootstrap'
pkgname=cmake-bootstrap
-version=3.18.2
+version=3.19.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin
--system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2
--no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui
${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
-make_build_args="-C Bootstrap.cmk"
+make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc"
makedepends="libarchive-devel"
short_desc="CMake (for bootstrapping only, not for normal usage)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
+checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2020-11-21 15:20 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-21 0:25 [PR PATCH] [NoMerge] cmake: update to 3.19.0 ndowens
2020-11-21 0:30 ` [PR REVIEW] " sgn
2020-11-21 0:35 ` ndowens
2020-11-21 0:40 ` ndowens
2020-11-21 0:40 ` sgn
2020-11-21 0:42 ` ndowens
2020-11-21 0:57 ` [PR PATCH] [Updated] " ndowens
2020-11-21 0:59 ` ndowens
2020-11-21 1:08 ` ndowens
2020-11-21 1:14 ` ndowens
2020-11-21 3:20 ` [PR PATCH] [Updated] " ndowens
2020-11-21 4:04 ` ndowens
2020-11-21 4:47 ` ndowens
2020-11-21 5:01 ` ndowens
2020-11-21 5:30 ` ndowens
2020-11-21 5:38 ` [PR REVIEW] " sgn
2020-11-21 5:38 ` sgn
2020-11-21 9:34 ` [PR REVIEW] " ndowens
2020-11-21 9:34 ` ndowens
2020-11-21 10:07 ` [PR REVIEW] " sgn
2020-11-21 10:08 ` sgn
2020-11-21 10:08 ` sgn
2020-11-21 15:20 ` [PR PATCH] [Updated] " ndowens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).