summaryrefslogtreecommitdiff
path: root/dev-build
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-19 12:05:02 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-19 12:05:02 +0100
commitb6cfc0c19effe2d9f7b8ab303cd00636f16da253 (patch)
treea0158050dac0a7ebfb9df4f667ec6ad2dd185538 /dev-build
parent2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (diff)
gentoo auto-resync : 19:04:2024 - 12:05:02
Diffstat (limited to 'dev-build')
-rw-r--r--dev-build/Manifest.gzbin6541 -> 6541 bytes
-rw-r--r--dev-build/ninja/Manifest4
-rw-r--r--dev-build/ninja/ninja-1.12.0.ebuild21
-rw-r--r--dev-build/ninja/ninja-9999.ebuild21
4 files changed, 24 insertions, 22 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index e8179b69b04e..3f338648814c 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
Binary files differ
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 74fa2ad8cbc2..e0cba8bcd2f0 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
EBUILD ninja-1.11.1-r5.ebuild 2451 BLAKE2B bf0e6fc2f7d09db24ca6b58a4a1e081ef08ee2bb04acc73af3e2f8fe8f77745f99ac8d68d0338b0867a0040555b6eddad61930c7ce7d72d43d0c426511b078a9 SHA512 831f9e6e2800fdf5c466ba0d69a9034b0c329a2d34b80cad723dead14d02a205ee76b398ca6a56b7d16a1ce8249b1be1493ce77bfb7e8e98e86e0a665f797b1b
-EBUILD ninja-1.12.0.ebuild 2229 BLAKE2B 18ddf25348637f391dd5562c55cc2e4d8dacbb67b62706e2adccf4654995feebec3c202da56c7c42241b3bbbf1957c943b7f257ec218f3ee1b0189715b7cab95 SHA512 2b85bd93fb613e39d6cd247f78198de7f144964f1876ce2c1d57d5a2c92a094428cd2d7036865858d0690f193c0da144db058b60f33221a48e3d111954168f4d
-EBUILD ninja-9999.ebuild 2229 BLAKE2B 18ddf25348637f391dd5562c55cc2e4d8dacbb67b62706e2adccf4654995feebec3c202da56c7c42241b3bbbf1957c943b7f257ec218f3ee1b0189715b7cab95 SHA512 2b85bd93fb613e39d6cd247f78198de7f144964f1876ce2c1d57d5a2c92a094428cd2d7036865858d0690f193c0da144db058b60f33221a48e3d111954168f4d
+EBUILD ninja-1.12.0.ebuild 2274 BLAKE2B 4fa8ff716f1aaf61447029eac4663454941c7faebc0e81688ae3f8df35c57d3d7207eaf6e7f38add7b5bd6fab3b68e252f4c8999a262c5aca0cdd3786fdc647a SHA512 79b8db18779e6a21ce333ccb58648a18b0d94b6bf10bfe0a75e87a07ce1fedc2ce9d8e5b9ec118a35dc27a09ddfeb4b1995ae5911d87106bea23f9290ca7c08e
+EBUILD ninja-9999.ebuild 2274 BLAKE2B 4fa8ff716f1aaf61447029eac4663454941c7faebc0e81688ae3f8df35c57d3d7207eaf6e7f38add7b5bd6fab3b68e252f4c8999a262c5aca0cdd3786fdc647a SHA512 79b8db18779e6a21ce333ccb58648a18b0d94b6bf10bfe0a75e87a07ce1fedc2ce9d8e5b9ec118a35dc27a09ddfeb4b1995ae5911d87106bea23f9290ca7c08e
MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
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