* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-04-15 20:14 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-04-15 20:14 UTC (permalink / raw
To: gentoo-commits
commit: cad3542b8b988747e5b5c9a28dfa3650e426ce2c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 20:05:32 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 20:12:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad3542b
dev-build/ninja: switch to cmake build system
configure.py no longer supports building tests.
Using cmake also simplifies cross-compiles.
Bug: https://bugs.gentoo.org/929221
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-9999.ebuild | 66 +++++++++++++++++----------------------
1 file changed, 28 insertions(+), 38 deletions(-)
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 9442eeaecf97..932bf822922b 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -3,9 +3,11 @@
EAPI=8
+CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
+CMAKE_MAKEFILE_GENERATOR=emake
PYTHON_COMPAT=( python3_{10..12} )
-inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -24,9 +26,9 @@ IUSE="doc test"
RESTRICT="!test? ( test )"
BDEPEND="
- ${PYTHON_DEPS}
dev-util/re2c
doc? (
+ ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
@@ -38,42 +40,31 @@ PDEPEND="
app-alternatives/ninja
"
-PATCHES=(
- "${FILESDIR}"/ninja-cflags.patch
-)
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=
- local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- echo "$@" >&2
- "$@"
+pkg_setup() {
+ :
}
-src_compile() {
- tc-export AR CXX
-
- # configure.py appends CFLAGS to CXXFLAGS
- unset CFLAGS
-
- local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+docs_enabled() {
+ use doc && ! tc-is-cross-compiler
+}
- run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test ON OFF)
+ )
+ cmake_src_configure
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- ${EPYTHON} configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
+ if docs_enabled; then
+ python_setup
+ edo ${EPYTHON} configure.py
fi
+}
+
+src_compile() {
+ cmake_src_compile
- if use doc; then
- ./ninja-build -v doxygen manual || die
+ if docs_enabled; then
+ edo ./ninja -v -j1 doxygen manual
fi
}
@@ -81,22 +72,21 @@ src_test() {
if ! tc-is-cross-compiler; then
# Bug 485772
ulimit -n 2048
- edo ./ninja -v ninja_test
- edo ./ninja_test
+ cmake_src_test
fi
}
src_install() {
- dodoc README.md CONTRIBUTING.md
+ cmake_src_install
- if use doc; then
+ mv "${ED}"/usr/bin/ninja{,-reference} || die
+
+ if docs_enabled; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
fi
- newbin ninja ninja-reference
-
newbashcomp misc/bash-completion ${PN}
insinto /usr/share/vim/vimfiles/syntax/
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-13 19:45 Arthur Zamarin
0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2024-10-13 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 696518b58dc3816466fb89cd2cf7e09e8f1edf30
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 19:45:24 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 19:45:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696518b5
dev-build/ninja: Stabilize 1.12.1 sparc, #940873
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 73764205cc69..6411c72d4323 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-09 7:22 Arthur Zamarin
0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2024-10-09 7:22 UTC (permalink / raw
To: gentoo-commits
commit: db5591f211ac75ac51267e57a46b28643552a5c0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 07:22:20 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 9 07:22:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5591f2
dev-build/ninja: Stabilize 1.12.1 arm64, #940873
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index bc244be7f779..73764205cc69 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-09 0:06 Jakov Smolić
0 siblings, 0 replies; 25+ messages in thread
From: Jakov Smolić @ 2024-10-09 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 8408fc11772273d32aae1c31d78e70ebb55f2a58
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 00:05:30 2024 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Oct 9 00:05:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8408fc11
dev-build/ninja: Stabilize 1.12.1 ppc, #940873
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 2b7081440718..bc244be7f779 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-05 14:42 Arthur Zamarin
0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2024-10-05 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 4de813c7864d178b91833caf4af9ef297406902b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 14:42:45 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 14:42:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de813c7
dev-build/ninja: Stabilize 1.12.1 arm, #940873
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 146905b4cf62..2b7081440718 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-05 14:30 Arthur Zamarin
0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2024-10-05 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 873b1661925aed71c40066af947bb07e2c34c9d1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 14:29:46 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 14:29:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873b1661
dev-build/ninja: Stabilize 1.12.1 amd64, #940873
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 85f7a1b1ea79..146905b4cf62 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-05 12:58 Arthur Zamarin
0 siblings, 0 replies; 25+ messages in thread
From: Arthur Zamarin @ 2024-10-05 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 52af39e4ff55334b7d6266730914aced381d4ed5
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 12:58:13 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 12:58:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52af39e4
dev-build/ninja: Stabilize 1.12.1 x86, #940873
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 71636bd4c57b..85f7a1b1ea79 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-10-05 11:12 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-10-05 11:12 UTC (permalink / raw
To: gentoo-commits
commit: f122de5014387e429eb65f5f1ced438f02a98650
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 5 11:11:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 11:11:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f122de50
dev-build/ninja: Stabilize 1.12.1 ppc64, #940873
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index a99cd086fbea..71636bd4c57b 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
GTEST_VER=1.14.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-07-04 0:59 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-07-04 0:59 UTC (permalink / raw
To: gentoo-commits
commit: 91f85d49318e528dfc57948ebae0ba3c13fe5787
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 00:53:19 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 00:56:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f85d49
dev-build/ninja: fix whitspace handling in configure args
An unquoted command substitution will be split on IFS.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index 1d8f3d0a0b09..db74a6448e70 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -66,14 +66,17 @@ bootstrap() {
local -x LDFLAGS=${BUILD_LDFLAGS}
fi
- local bootstrap_args=(
+ local args=(
--with-python=python
--bootstrap
--verbose
- $(usev test --gtest-source-dir="${WORKDIR}"/googletest-${GTEST_VER})
)
- edo ${EPYTHON} configure.py "${bootstrap_args[@]}"
+ if use test; then
+ args+=( --gtest-source-dir="${WORKDIR}"/googletest-${GTEST_VER} )
+ fi
+
+ edo ${EPYTHON} configure.py "${args[@]}"
}
src_compile() {
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-07-04 0:59 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-07-04 0:59 UTC (permalink / raw
To: gentoo-commits
commit: 6941a8d364c83e62b33c173ceb8652f0ae9948df
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 00:58:55 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 00:58:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6941a8d3
dev-build/ninja: move variables to satisfy pkgcheck
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.12.1.ebuild | 6 +++---
dev-build/ninja/ninja-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-build/ninja/ninja-1.12.1.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
index db74a6448e70..05b835dcd49c 100644
--- a/dev-build/ninja/ninja-1.12.1.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -7,6 +7,9 @@ PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
inherit git-r3
@@ -18,9 +21,6 @@ fi
GTEST_VER=1.14.0
SRC_URI+=" test? ( https://github.com/google/googletest/archive/refs/tags/v${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz )"
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc test"
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 1f7a8e02d01c..0bd7a0f8370e 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -7,6 +7,9 @@ PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
inherit git-r3
@@ -18,9 +21,6 @@ fi
GTEST_VER=1.14.0
SRC_URI+=" test? ( https://github.com/google/googletest/archive/refs/tags/v${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz )"
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc test"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-06-01 3:56 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-06-01 3:56 UTC (permalink / raw
To: gentoo-commits
commit: 5707d9394c78b2d83c6eee75214f8bd7ac832942
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 03:54:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 03:54:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5707d939
dev-build/ninja: drop 1.12.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/Manifest | 1 -
dev-build/ninja/ninja-1.12.0.ebuild | 106 ------------------------------------
2 files changed, 107 deletions(-)
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 8e41e460a754..31bb62aaf6a5 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,3 +1,2 @@
DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
-DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4 SHA512 d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b321111b806aa7efa1061f031a1319b074391db61b0cbdccf096954c
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
deleted file mode 100644
index 3af9c43f1b06..000000000000
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-text/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- )
-"
-PDEPEND="
- app-alternatives/ninja
-"
-
-pkg_setup() {
- :
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/ninja-cflags.patch
- )
- default
-}
-
-bootstrap() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=
- local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
-}
-
-src_compile() {
- python_setup
-
- tc-export AR CXX
- unset CFLAGS
- export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
-
- bootstrap
-
- if use doc; then
- edo ./ninja -v doxygen manual
- fi
-
- if tc-is-cross-compiler; then
- edo ${EPYTHON} configure.py --with-python=python
- edo ./ninja -v ninja
- fi
-}
-
-src_install() {
- newbin ninja{,-reference}
-
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
-
- newbashcomp misc/bash-completion ${PN}
-
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/ninja.vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}"/ninja.vim
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-}
-
-pkg_postinst() {
- if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
- ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
- fi
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-05-11 17:03 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-05-11 17:03 UTC (permalink / raw
To: gentoo-commits
commit: d54bb97f340dca4ff8b785623b14a5412d967747
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 16:59:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 11 17:02:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54bb97f
dev-build/ninja: add 1.12.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/Manifest | 1 +
dev-build/ninja/{ninja-9999.ebuild => ninja-1.12.1.ebuild} | 2 +-
dev-build/ninja/ninja-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 5a84814e8171..8e41e460a754 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,2 +1,3 @@
DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
+DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4 SHA512 d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b321111b806aa7efa1061f031a1319b074391db61b0cbdccf096954c
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-1.12.1.ebuild
similarity index 98%
copy from dev-build/ninja/ninja-9999.ebuild
copy to dev-build/ninja/ninja-1.12.1.ebuild
index 3af9c43f1b06..b387ddf90c06 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 3af9c43f1b06..b387ddf90c06 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-04-20 0:19 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-04-20 0:19 UTC (permalink / raw
To: gentoo-commits
commit: d3cec83caf1478a2ac994ac2ca2d149553e61132
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 00:17:03 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 00:17:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cec83c
dev-build/ninja: switch back to configure.py
Using cmake causes a circular dependency via dev-libs/jsoncpp.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.12.0.ebuild | 63 +++++++++++++++++--------------------
dev-build/ninja/ninja-9999.ebuild | 63 +++++++++++++++++--------------------
2 files changed, 56 insertions(+), 70 deletions(-)
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -3,10 +3,9 @@
EAPI=8
-CMAKE_MAKEFILE_GENERATOR=emake
PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
BDEPEND="
+ ${PYTHON_DEPS}
dev-util/re2c
doc? (
- ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
- test? ( dev-cpp/gtest )
"
PDEPEND="
app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
:
}
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
)
- cmake_src_configure
+ default
+}
- if use doc; then
- if tc-is-cross-compiler; then
- mycmakeargs=( -DBUILD_TESTING=OFF )
- local BUILD_DIR=${WORKDIR}/native
- local SYSROOT=
- tc-env_build cmake_src_configure
- fi
-
- python_setup
- edo ${EPYTHON} configure.py
+bootstrap() {
+ if tc-is-cross-compiler; then
+ local -x AR=$(tc-getBUILD_AR)
+ local -x CXX=$(tc-getBUILD_CXX)
+ local -x CFLAGS=
+ local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+ local -x LDFLAGS=${BUILD_LDFLAGS}
fi
+ edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
}
src_compile() {
- cmake_src_compile
+ python_setup
+
+ tc-export AR CXX
+ unset CFLAGS
+ export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+
+ bootstrap
if use doc; then
- if tc-is-cross-compiler; then
- local BUILD_DIR=${WORKDIR}/native
- cmake_build ninja
- fi
- edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
+ edo ./ninja -v doxygen manual
fi
-}
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- cmake_src_test
+ if tc-is-cross-compiler; then
+ edo ${EPYTHON} configure.py --with-python=python
+ edo ./ninja -v ninja
fi
}
src_install() {
- cmake_src_install
-
- mv "${ED}"/usr/bin/ninja{,-reference} || die
+ newbin ninja{,-reference}
if use doc; then
docinto html
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -3,10 +3,9 @@
EAPI=8
-CMAKE_MAKEFILE_GENERATOR=emake
PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
BDEPEND="
+ ${PYTHON_DEPS}
dev-util/re2c
doc? (
- ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
- test? ( dev-cpp/gtest )
"
PDEPEND="
app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
:
}
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
)
- cmake_src_configure
+ default
+}
- if use doc; then
- if tc-is-cross-compiler; then
- mycmakeargs=( -DBUILD_TESTING=OFF )
- local BUILD_DIR=${WORKDIR}/native
- local SYSROOT=
- tc-env_build cmake_src_configure
- fi
-
- python_setup
- edo ${EPYTHON} configure.py
+bootstrap() {
+ if tc-is-cross-compiler; then
+ local -x AR=$(tc-getBUILD_AR)
+ local -x CXX=$(tc-getBUILD_CXX)
+ local -x CFLAGS=
+ local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+ local -x LDFLAGS=${BUILD_LDFLAGS}
fi
+ edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
}
src_compile() {
- cmake_src_compile
+ python_setup
+
+ tc-export AR CXX
+ unset CFLAGS
+ export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+
+ bootstrap
if use doc; then
- if tc-is-cross-compiler; then
- local BUILD_DIR=${WORKDIR}/native
- cmake_build ninja
- fi
- edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
+ edo ./ninja -v doxygen manual
fi
-}
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- cmake_src_test
+ if tc-is-cross-compiler; then
+ edo ${EPYTHON} configure.py --with-python=python
+ edo ./ninja -v ninja
fi
}
src_install() {
- cmake_src_install
-
- mv "${ED}"/usr/bin/ninja{,-reference} || die
+ newbin ninja{,-reference}
if use doc; then
docinto html
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-04-18 19:30 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-04-18 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 1122aa04647a60de150811c133490d248de4bc43
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 19:27:38 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:30:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1122aa04
dev-build/ninja: improve docs support when cross-compiling
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.12.0.ebuild | 21 +++++++++++----------
dev-build/ninja/ninja-9999.ebuild | 21 +++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
index fd0e6fc7d748..c7a7c9ee0b26 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
CMAKE_MAKEFILE_GENERATOR=emake
PYTHON_COMPAT=( python3_{10..12} )
@@ -51,6 +50,13 @@ src_configure() {
cmake_src_configure
if use doc; then
+ if tc-is-cross-compiler; then
+ mycmakeargs=( -DBUILD_TESTING=OFF )
+ local BUILD_DIR=${WORKDIR}/native
+ local SYSROOT=
+ tc-env_build cmake_src_configure
+ fi
+
python_setup
edo ${EPYTHON} configure.py
fi
@@ -60,16 +66,11 @@ src_compile() {
cmake_src_compile
if use doc; then
- local ninja=./ninja
if tc-is-cross-compiler; then
- ninja=$(type -P ninja)
- fi
- if [[ -n ${ninja} ]]; then
- edo "${ninja}" -v -j1 doxygen manual
- DOCS_BUILT=yes
- else
- DOCS_BUILT=no
+ local BUILD_DIR=${WORKDIR}/native
+ cmake_build ninja
fi
+ edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
fi
}
@@ -86,7 +87,7 @@ src_install() {
mv "${ED}"/usr/bin/ninja{,-reference} || die
- if [[ ${DOCS_BUILT} == yes ]]; then
+ if use doc; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index fd0e6fc7d748..c7a7c9ee0b26 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -3,7 +3,6 @@
EAPI=8
-CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
CMAKE_MAKEFILE_GENERATOR=emake
PYTHON_COMPAT=( python3_{10..12} )
@@ -51,6 +50,13 @@ src_configure() {
cmake_src_configure
if use doc; then
+ if tc-is-cross-compiler; then
+ mycmakeargs=( -DBUILD_TESTING=OFF )
+ local BUILD_DIR=${WORKDIR}/native
+ local SYSROOT=
+ tc-env_build cmake_src_configure
+ fi
+
python_setup
edo ${EPYTHON} configure.py
fi
@@ -60,16 +66,11 @@ src_compile() {
cmake_src_compile
if use doc; then
- local ninja=./ninja
if tc-is-cross-compiler; then
- ninja=$(type -P ninja)
- fi
- if [[ -n ${ninja} ]]; then
- edo "${ninja}" -v -j1 doxygen manual
- DOCS_BUILT=yes
- else
- DOCS_BUILT=no
+ local BUILD_DIR=${WORKDIR}/native
+ cmake_build ninja
fi
+ edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
fi
}
@@ -86,7 +87,7 @@ src_install() {
mv "${ED}"/usr/bin/ninja{,-reference} || die
- if [[ ${DOCS_BUILT} == yes ]]; then
+ if use doc; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-04-16 15:14 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-04-16 15:14 UTC (permalink / raw
To: gentoo-commits
commit: 00f988e1a48d08c5758de35771776104471ee97f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 15:12:26 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 15:12:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f988e1
dev-build/ninja: enable docs build when cross-compiling
... if ninja is in PATH.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.12.0.ebuild | 21 +++++++++++++--------
dev-build/ninja/ninja-9999.ebuild | 21 +++++++++++++--------
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
index 932bf822922b..fd0e6fc7d748 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -44,17 +44,13 @@ pkg_setup() {
:
}
-docs_enabled() {
- use doc && ! tc-is-cross-compiler
-}
-
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)
)
cmake_src_configure
- if docs_enabled; then
+ if use doc; then
python_setup
edo ${EPYTHON} configure.py
fi
@@ -63,8 +59,17 @@ src_configure() {
src_compile() {
cmake_src_compile
- if docs_enabled; then
- edo ./ninja -v -j1 doxygen manual
+ if use doc; then
+ local ninja=./ninja
+ if tc-is-cross-compiler; then
+ ninja=$(type -P ninja)
+ fi
+ if [[ -n ${ninja} ]]; then
+ edo "${ninja}" -v -j1 doxygen manual
+ DOCS_BUILT=yes
+ else
+ DOCS_BUILT=no
+ fi
fi
}
@@ -81,7 +86,7 @@ src_install() {
mv "${ED}"/usr/bin/ninja{,-reference} || die
- if docs_enabled; then
+ if [[ ${DOCS_BUILT} == yes ]]; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 932bf822922b..fd0e6fc7d748 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -44,17 +44,13 @@ pkg_setup() {
:
}
-docs_enabled() {
- use doc && ! tc-is-cross-compiler
-}
-
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)
)
cmake_src_configure
- if docs_enabled; then
+ if use doc; then
python_setup
edo ${EPYTHON} configure.py
fi
@@ -63,8 +59,17 @@ src_configure() {
src_compile() {
cmake_src_compile
- if docs_enabled; then
- edo ./ninja -v -j1 doxygen manual
+ if use doc; then
+ local ninja=./ninja
+ if tc-is-cross-compiler; then
+ ninja=$(type -P ninja)
+ fi
+ if [[ -n ${ninja} ]]; then
+ edo "${ninja}" -v -j1 doxygen manual
+ DOCS_BUILT=yes
+ else
+ DOCS_BUILT=no
+ fi
fi
}
@@ -81,7 +86,7 @@ src_install() {
mv "${ED}"/usr/bin/ninja{,-reference} || die
- if docs_enabled; then
+ if [[ ${DOCS_BUILT} == yes ]]; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-04-15 20:14 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-04-15 20:14 UTC (permalink / raw
To: gentoo-commits
commit: c236ec2e25c74092b85e6c78c02c66745e606a48
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 20:12:08 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 20:12:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c236ec2e
dev-build/ninja: add 1.12.0
Closes: https://bugs.gentoo.org/929221
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/Manifest | 1 +
dev-build/ninja/ninja-1.12.0.ebuild | 107 ++++++++++++++++++++++++++++++++++++
2 files changed, 108 insertions(+)
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 4ccdb98ca1a4..5a84814e8171 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1 +1,2 @@
DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
+DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
new file mode 100644
index 000000000000..932bf822922b
--- /dev/null
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2012-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-util/re2c
+ doc? (
+ ${PYTHON_DEPS}
+ app-text/asciidoc
+ app-text/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ )
+ test? ( dev-cpp/gtest )
+"
+PDEPEND="
+ app-alternatives/ninja
+"
+
+pkg_setup() {
+ :
+}
+
+docs_enabled() {
+ use doc && ! tc-is-cross-compiler
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test ON OFF)
+ )
+ cmake_src_configure
+
+ if docs_enabled; then
+ python_setup
+ edo ${EPYTHON} configure.py
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if docs_enabled; then
+ edo ./ninja -v -j1 doxygen manual
+ fi
+}
+
+src_test() {
+ if ! tc-is-cross-compiler; then
+ # Bug 485772
+ ulimit -n 2048
+ cmake_src_test
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ mv "${ED}"/usr/bin/ninja{,-reference} || die
+
+ if docs_enabled; then
+ docinto html
+ dodoc -r doc/doxygen/html/.
+ dodoc doc/manual.html
+ fi
+
+ newbashcomp misc/bash-completion ${PN}
+
+ insinto /usr/share/vim/vimfiles/syntax/
+ doins misc/ninja.vim
+
+ echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${T}"/ninja.vim
+
+ insinto /usr/share/zsh/site-functions
+ newins misc/zsh-completion _ninja
+}
+
+pkg_postinst() {
+ if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
+ ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-21 21:00 Mike Gilbert
0 siblings, 0 replies; 25+ messages in thread
From: Mike Gilbert @ 2024-02-21 21:00 UTC (permalink / raw
To: gentoo-commits
commit: be0f08020ddeea3acc624b2734e6dd763b15d992
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 20:52:59 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 20:59:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0f0802
dev-build/ninja: drop 1.11.1-r2, 1.11.1-r3, 1.11.1-r4
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r2.ebuild | 127 --------------------------------
dev-build/ninja/ninja-1.11.1-r3.ebuild | 131 ---------------------------------
dev-build/ninja/ninja-1.11.1-r4.ebuild | 117 -----------------------------
3 files changed, 375 deletions(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r2.ebuild b/dev-build/ninja/ninja-1.11.1-r2.ebuild
deleted file mode 100644
index 0cb89335a647..000000000000
--- a/dev-build/ninja/ninja-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-text/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- )
- test? ( dev-cpp/gtest )
-"
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-
-PATCHES=(
- "${FILESDIR}"/ninja-cflags.patch
-)
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- echo "$@" >&2
- "$@"
-}
-
-src_compile() {
- tc-export AR CXX
-
- # configure.py appends CFLAGS to CXXFLAGS
- unset CFLAGS
-
- append-lfs-flags
-
- run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
-
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- ${EPYTHON} configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
- fi
-
- if use doc; then
- ./ninja-build -v doxygen manual || die
- fi
-
- if use emacs; then
- elisp-compile misc/ninja-mode.el || die
- fi
-}
-
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- edo ./ninja -v ninja_test
- edo ./ninja_test
- fi
-}
-
-src_install() {
- dodoc README.md CONTRIBUTING.md
-
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
-
- dobin ninja
-
- newbashcomp misc/bash-completion ${PN}
-
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/ninja.vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}"/ninja.vim
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-
- if use emacs; then
- cd misc || die
- elisp-install ninja ninja-mode.el* || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-build/ninja/ninja-1.11.1-r3.ebuild b/dev-build/ninja/ninja-1.11.1-r3.ebuild
deleted file mode 100644
index 2ca427037c35..000000000000
--- a/dev-build/ninja/ninja-1.11.1-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-text/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- )
- test? ( dev-cpp/gtest )
-"
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-PDEPEND="app-alternatives/ninja"
-
-PATCHES=(
- "${FILESDIR}"/ninja-cflags.patch
-)
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- echo "$@" >&2
- "$@"
-}
-
-src_compile() {
- tc-export AR CXX
-
- # configure.py appends CFLAGS to CXXFLAGS
- unset CFLAGS
-
- append-lfs-flags
-
- run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
-
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- ${EPYTHON} configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
- fi
-
- if use doc; then
- ./ninja-build -v doxygen manual || die
- fi
-
- if use emacs; then
- elisp-compile misc/ninja-mode.el || die
- fi
-}
-
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- edo ./ninja -v ninja_test
- edo ./ninja_test
- fi
-}
-
-src_install() {
- dodoc README.md CONTRIBUTING.md
-
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
-
- newbin ninja ninja-reference
-
- newbashcomp misc/bash-completion ${PN}
-
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/ninja.vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}"/ninja.vim
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-
- if use emacs; then
- cd misc || die
- elisp-install ninja ninja-mode.el* || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
- ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-build/ninja/ninja-1.11.1-r4.ebuild b/dev-build/ninja/ninja-1.11.1-r4.ebuild
deleted file mode 100644
index 4a9cf1f32132..000000000000
--- a/dev-build/ninja/ninja-1.11.1-r4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-text/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- )
- test? ( dev-cpp/gtest )
-"
-PDEPEND="
- app-alternatives/ninja
-"
-
-PATCHES=(
- "${FILESDIR}"/ninja-cflags.patch
-)
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- echo "$@" >&2
- "$@"
-}
-
-src_compile() {
- tc-export AR CXX
-
- # configure.py appends CFLAGS to CXXFLAGS
- unset CFLAGS
-
- append-lfs-flags
-
- run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
-
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- ${EPYTHON} configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
- fi
-
- if use doc; then
- ./ninja-build -v doxygen manual || die
- fi
-}
-
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- edo ./ninja -v ninja_test
- edo ./ninja_test
- fi
-}
-
-src_install() {
- dodoc README.md CONTRIBUTING.md
-
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
-
- newbin ninja ninja-reference
-
- newbashcomp misc/bash-completion ${PN}
-
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/ninja.vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}"/ninja.vim
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-}
-
-pkg_postinst() {
- if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
- ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
- fi
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 19:29 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 6f1b1849b7dc1dc728ae3ec4e6ad044048a7048f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 19:29:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 19:29:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1b1849
dev-build/ninja: Stabilize 1.11.1-r5 hppa, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 9440dad6602f..ee03031346ed 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 2:27 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 2:27 UTC (permalink / raw
To: gentoo-commits
commit: ae025bd2e5131a725c5c25aa3c12cee29e59ba09
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 02:27:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 02:27:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae025bd2
dev-build/ninja: Stabilize 1.11.1-r5 amd64, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 527e722bee7a..9440dad6602f 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 1:09 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 7d619cb2b1f156011ef7d68d229886d3e07c24ce
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 01:09:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 01:09:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d619cb2
dev-build/ninja: Stabilize 1.11.1-r5 ppc64, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 848958760824..ee05fd49aafe 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 1:09 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 10aa0c48e0b47c0a95a73f4779b95082ad62ecb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 01:09:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 01:09:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10aa0c48
dev-build/ninja: Stabilize 1.11.1-r5 x86, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index ee05fd49aafe..527e722bee7a 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 1:09 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 27c0d142ac3f7abad0125ea376e8b814882cbe87
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 01:09:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 01:09:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c0d142
dev-build/ninja: Stabilize 1.11.1-r5 ppc, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index a262983b2a48..848958760824 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 0:36 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 432eac5a61b3ad67d4b452b1704b714dcde91eef
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 00:36:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 00:36:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432eac5a
dev-build/ninja: Stabilize 1.11.1-r5 arm, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index b134868baa75..a262983b2a48 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 0:36 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 84d8d8f18683d83d07ed774ed69d5aec570b6d62
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 00:36:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 00:36:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d8d8f1
dev-build/ninja: Stabilize 1.11.1-r5 sparc, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index c4f79506da26..b134868baa75 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/
@ 2024-02-06 0:36 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2024-02-06 0:36 UTC (permalink / raw
To: gentoo-commits
commit: e328b6bfe7d6969169e1a09bb0e8d7dca3010d79
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 00:36:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 00:36:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e328b6bf
dev-build/ninja: Stabilize 1.11.1-r5 arm64, #923850
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index eae54565f9fc..c4f79506da26 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-10-13 19:45 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-15 20:14 [gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-10-13 19:45 Arthur Zamarin
2024-10-09 7:22 Arthur Zamarin
2024-10-09 0:06 Jakov Smolić
2024-10-05 14:42 Arthur Zamarin
2024-10-05 14:30 Arthur Zamarin
2024-10-05 12:58 Arthur Zamarin
2024-10-05 11:12 Sam James
2024-07-04 0:59 Mike Gilbert
2024-07-04 0:59 Mike Gilbert
2024-06-01 3:56 Sam James
2024-05-11 17:03 Sam James
2024-04-20 0:19 Mike Gilbert
2024-04-18 19:30 Mike Gilbert
2024-04-16 15:14 Mike Gilbert
2024-04-15 20:14 Mike Gilbert
2024-02-21 21:00 Mike Gilbert
2024-02-06 19:29 Sam James
2024-02-06 2:27 Sam James
2024-02-06 1:09 Sam James
2024-02-06 1:09 Sam James
2024-02-06 1:09 Sam James
2024-02-06 0:36 Sam James
2024-02-06 0:36 Sam James
2024-02-06 0:36 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox