* [PR PATCH] cmake 3.19.4
@ 2021-01-31 2:50 sgn
2021-02-08 23:20 ` [PR PATCH] [Closed]: " Johnnynator
2021-02-08 23:21 ` Johnnynator
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-01-31 2:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-ninja
https://github.com/void-linux/void-packages/pull/28350
cmake 3.19.4
- Completely untested (beside using it to build ccache), not even tried to cross build
- PR created to coordinate with #28304
A patch file from https://github.com/void-linux/void-packages/pull/28350.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-ninja-28350.patch --]
[-- Type: text/x-diff, Size: 10808 bytes --]
From fb05b962d6b4b0e89d7bd420737694430dd7f5fe Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH 1/8] build-style/cmake: use ninja as default generator
---
common/build-style/cmake.sh | 8 ++++----
common/environment/build-style/cmake.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..b8b070dbf32 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,7 +64,7 @@ _EOF
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
- cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
+ cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
-e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
# Replace -isystem with -I for Qt4 and Qt5 packages
@@ -72,7 +72,7 @@ _EOF
}
do_build() {
- : ${make_cmd:=make}
+ : ${make_cmd:=ninja}
cd ${cmake_builddir:=build}
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +92,14 @@ do_check() {
fi
fi
- : ${make_cmd:=make}
+ : ${make_cmd:=ninja}
: ${make_check_target:=test}
CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
}
do_install() {
- : ${make_cmd:=make}
+ : ${make_cmd:=ninja}
: ${make_install_target:=install}
cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
if [ "$CHROOT_READY" ]; then
if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
- hostmakedepends+=" cmake"
+ hostmakedepends+=" cmake ninja"
fi
fi
From c060d9d4c481f469b616964da349984549b6c34d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:30:11 +0100
Subject: [PATCH 2/8] ccache: force bootstrap build to use gnu-make
---
srcpkgs/ccache/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 8b46fdd4686..52e60be6fcb 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,6 +16,8 @@ checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
if [ -z "$CHROOT_READY" ]; then
hostmakedepends="cmake-bootstrap"
+ configure_args+=" -G'Unix Makefiles'"
+ make_cmd="make"
else
hostmakedepends="asciidoc perl"
fi
From 7d8b697420d590bc8d2e8c41e413b75706f88821 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:47:02 +0100
Subject: [PATCH 3/8] build-style/cmake: replace sed monstrosity with
${wrksrc}/${build_wrksrc}
---
common/build-style/cmake.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index b8b070dbf32..6078ede1f49 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -64,8 +64,7 @@ _EOF
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
- cmake ${cmake_args} -GNinja ${configure_args} $(echo ${cmake_builddir}|sed \
- -e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g')
+ cmake ${cmake_args} -GNinja ${configure_args} ${wrksrc}/${build_wrksrc}
# Replace -isystem with -I for Qt4 and Qt5 packages
find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;
From 6a3bded646ecfeb9de78f8ff2356a8363c0c5bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:44:23 +0700
Subject: [PATCH 4/8] fixup! build-style/cmake: use ninja as default generator
---
common/build-style/cmake.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 6078ede1f49..26d55f527e3 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,9 +62,10 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
+ export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
- cmake ${cmake_args} -GNinja ${configure_args} ${wrksrc}/${build_wrksrc}
+ cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
# Replace -isystem with -I for Qt4 and Qt5 packages
find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;
From e576c6607f8c7ccd1daa69051d97c7c5b2e9bfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:44:41 +0700
Subject: [PATCH 5/8] fixup! ccache: force bootstrap build to use gnu-make
---
srcpkgs/ccache/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 52e60be6fcb..9f42aa47315 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -16,7 +16,7 @@ checksum=5fdc804056632d722a1182e15386696f0ea6c59cb4ab4d65a54f0b269ae86f99
if [ -z "$CHROOT_READY" ]; then
hostmakedepends="cmake-bootstrap"
- configure_args+=" -G'Unix Makefiles'"
+ export CMAKE_GENERATOR="Unix Makefiles"
make_cmd="make"
else
hostmakedepends="asciidoc perl"
From 4ac6b57fd4790a2229f93810c321074d4c408389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:19:11 +0700
Subject: [PATCH 6/8] cmake-bootstrap: update to 3.19.4.
---
srcpkgs/cmake-bootstrap/template | 4 ++--
srcpkgs/cmake-bootstrap/update | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index fca0464975c..539033d6ffa 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.19.2
+version=3.19.4
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -16,7 +16,7 @@ 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=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
diff --git a/srcpkgs/cmake-bootstrap/update b/srcpkgs/cmake-bootstrap/update
index 4671bfbb185..92f85b5350b 100644
--- a/srcpkgs/cmake-bootstrap/update
+++ b/srcpkgs/cmake-bootstrap/update
@@ -1 +1,2 @@
site='https://cmake.org/download/'
+pkgname=cmake
From 806e1da868511541d444ece250129a01f2db6265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:19:37 +0700
Subject: [PATCH 7/8] cmake: update to 3.19.4.
---
.../cmake/patches/0001-Disable-try_run.patch | 27 -------------------
srcpkgs/cmake/template | 7 +++--
2 files changed, 5 insertions(+), 29 deletions(-)
delete 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
deleted file mode 100644
index 3e05af1a581..00000000000
--- a/srcpkgs/cmake/patches/0001-Disable-try_run.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 b5289095e4a..e95cc40abc7 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,11 +1,12 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.3
+version=3.19.4
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
-DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
make_check_target=test
+make_cmd=make
hostmakedepends="cmake-bootstrap gcc-fortran"
makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
ncurses-devel rhash-devel jsoncpp-devel"
@@ -15,7 +16,9 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
license="BSD-3-Clause, ICU"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+
+export CMAKE_GENERATOR="Unix Makefiles"
pre_check() {
# use ctest of this build instead of requirig cmake to test cmake...
From 52a799cf0b130ff63a3c174de374a3abdfcf9038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 31 Jan 2021 09:43:17 +0700
Subject: [PATCH 8/8] cmake-gui: update to 3.19.4.
---
srcpkgs/cmake-gui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index cac045092ba..369450ed3cd 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.19.2
+version=3.19.4
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
+checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
do_install() {
# We are only interested in cmake-gui.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Closed]: cmake 3.19.4
2021-01-31 2:50 [PR PATCH] cmake 3.19.4 sgn
@ 2021-02-08 23:20 ` Johnnynator
2021-02-08 23:21 ` Johnnynator
1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2021-02-08 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
There's a closed pull request on the void-packages repository
cmake 3.19.4
https://github.com/void-linux/void-packages/pull/28350
Description:
- Completely untested (beside using it to build ccache), not even tried to cross build
- PR created to coordinate with #28304
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: cmake 3.19.4
2021-01-31 2:50 [PR PATCH] cmake 3.19.4 sgn
2021-02-08 23:20 ` [PR PATCH] [Closed]: " Johnnynator
@ 2021-02-08 23:21 ` Johnnynator
1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2021-02-08 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/28350#issuecomment-775529874
Comment:
I hope rebuilding like every package once was enough for smoke testing.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-08 23:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-31 2:50 [PR PATCH] cmake 3.19.4 sgn
2021-02-08 23:20 ` [PR PATCH] [Closed]: " Johnnynator
2021-02-08 23:21 ` Johnnynator
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).