[PR PATCH] ninja: update to 1.12.1.

[PR PATCH] ninja: update to 1.12.1.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

There is a new pull request by Duncaen against master on the void-packages repository

https://github.com/Duncaen/void-packages ninja-1.12.1
https://github.com/void-linux/void-packages/pull/52171

ninja: update to 1.12.1.
None

A patch file from https://github.com/void-linux/void-packages/pull/52171.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ninja-1.12.1-52171.patch --]
[-- Type: text/x-diff, Size: 2557 bytes --]

From 33c76481bfd124e766575443188a8ab7e83382bc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Sep 2024 17:29:26 +0200
Subject: [PATCH] ninja: update to 1.12.1.

---
 srcpkgs/ninja/template | 44 ++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index 6c13f40c7807b1..94794b335431be 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -1,14 +1,19 @@
 # Template file for 'ninja'
 pkgname=ninja
-version=1.11.1
-revision=4
-hostmakedepends="python3 asciidoc"
+version=1.12.1
+revision=1
+build_style=cmake
+make_cmd=make
+hostmakedepends="asciidoc"
+checkdepends="gtest-devel"
 short_desc="Small build system with a focus on speed"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://ninja-build.org/"
 distfiles="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz"
-checksum=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
+checksum=821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 if [ "$XBPS_WORDSIZE" = 32 ]; then
 	BUILD_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -20,33 +25,22 @@ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 fi
 
-do_configure() {
-	# Skip rebuild with bootstrapped ninja until build phase:
-	vsed -e "s|subprocess.check_call(rebuild_args)|pass|" -i configure.py
-	python3 configure.py --bootstrap
-}
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=ON"
+else
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
 
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		HOST_CXXFLAGS="${BUILD_CFLAGS}"
-	else
-		HOST_CXXFLAGS="${CXXFLAGS}"
-	fi
-	CXXFLAGS="$HOST_CXXFLAGS" python3 configure.py
-	asciidoc doc/manual.asciidoc
-}
 
-do_check() {
-	./ninja ninja_test &&
-	./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
+post_build() {
+	asciidoc doc/manual.asciidoc
 }
 
-do_install() {
-	vbin ninja
+post_install() {
 	vdoc doc/manual.html
 	vdoc doc/manual.asciidoc
-	vinstall misc/bash-completion 644 usr/share/bash-completion/completions ninja
-	vinstall misc/zsh-completion 644 usr/share/zsh/site-functions _ninja
+	vcompletion misc/bash-completion bash ninja
+	vcompletion misc/zsh-completion zsh ninja
 	vinstall misc/ninja-mode.el 644 usr/share/emacs/site-lisp
 	vinstall misc/ninja.vim 644 usr/share/vim/vimfiles/syntax
 	vinstall misc/ninja_syntax.py 644 "${py3_sitelib}"

Re: [PR PATCH] [Updated] ninja: update to 1.12.1.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There is an updated pull request by Duncaen against master on the void-packages repository

https://github.com/Duncaen/void-packages ninja-1.12.1
https://github.com/void-linux/void-packages/pull/52171

ninja: update to 1.12.1.
None

A patch file from https://github.com/void-linux/void-packages/pull/52171.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ninja-1.12.1-52171.patch --]
[-- Type: text/x-diff, Size: 3609 bytes --]

From 33c76481bfd124e766575443188a8ab7e83382bc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Sep 2024 17:29:26 +0200
Subject: [PATCH 1/2] ninja: update to 1.12.1.

---
 srcpkgs/ninja/template | 44 ++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template
index 6c13f40c7807b1..94794b335431be 100644
--- a/srcpkgs/ninja/template
+++ b/srcpkgs/ninja/template
@@ -1,14 +1,19 @@
 # Template file for 'ninja'
 pkgname=ninja
-version=1.11.1
-revision=4
-hostmakedepends="python3 asciidoc"
+version=1.12.1
+revision=1
+build_style=cmake
+make_cmd=make
+hostmakedepends="asciidoc"
+checkdepends="gtest-devel"
 short_desc="Small build system with a focus on speed"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://ninja-build.org/"
 distfiles="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz"
-checksum=31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea
+checksum=821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 if [ "$XBPS_WORDSIZE" = 32 ]; then
 	BUILD_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -20,33 +25,22 @@ if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 fi
 
-do_configure() {
-	# Skip rebuild with bootstrapped ninja until build phase:
-	vsed -e "s|subprocess.check_call(rebuild_args)|pass|" -i configure.py
-	python3 configure.py --bootstrap
-}
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=ON"
+else
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
 
-do_build() {
-	if [ "$CROSS_BUILD" ]; then
-		HOST_CXXFLAGS="${BUILD_CFLAGS}"
-	else
-		HOST_CXXFLAGS="${CXXFLAGS}"
-	fi
-	CXXFLAGS="$HOST_CXXFLAGS" python3 configure.py
-	asciidoc doc/manual.asciidoc
-}
 
-do_check() {
-	./ninja ninja_test &&
-	./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
+post_build() {
+	asciidoc doc/manual.asciidoc
 }
 
-do_install() {
-	vbin ninja
+post_install() {
 	vdoc doc/manual.html
 	vdoc doc/manual.asciidoc
-	vinstall misc/bash-completion 644 usr/share/bash-completion/completions ninja
-	vinstall misc/zsh-completion 644 usr/share/zsh/site-functions _ninja
+	vcompletion misc/bash-completion bash ninja
+	vcompletion misc/zsh-completion zsh ninja
 	vinstall misc/ninja-mode.el 644 usr/share/emacs/site-lisp
 	vinstall misc/ninja.vim 644 usr/share/vim/vimfiles/syntax
 	vinstall misc/ninja_syntax.py 644 "${py3_sitelib}"

From 7fdae9d08900d6bc5670258d970aceda67ec144b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Sep 2024 17:40:03 +0200
Subject: [PATCH 2/2] gtest: build using make to avoid ninja cycle

---
 srcpkgs/gtest/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/gtest/template b/srcpkgs/gtest/template
index 8ebaf450ed6826..b85c58f93f9988 100644
--- a/srcpkgs/gtest/template
+++ b/srcpkgs/gtest/template
@@ -3,6 +3,7 @@ pkgname=gtest
 version=1.12.1
 revision=1
 build_style=cmake
+make_cmd=make # using make to avoid a cycle: ninja -> gtest -> ninja
 configure_args="-DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON"
 hostmakedepends="unzip"
 short_desc="Google's framework for writing C++ tests"
@@ -12,6 +13,8 @@ homepage="https://github.com/google/googletest"
 distfiles="https://github.com/google/googletest/archive/release-${version}.tar.gz"
 checksum=81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2
 
+export CMAKE_GENERATOR="Unix Makefiles"
+
 post_install() {
 	vlicense LICENSE
 }

Re: ninja: update to 1.12.1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/52171#issuecomment-2343442354

Comment:
Supercedes #50795.

Re: [PR PATCH] [Merged]: ninja: update to 1.12.1.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a merged pull request on the void-packages repository

ninja: update to 1.12.1.
https://github.com/void-linux/void-packages/pull/52171

Description:
None