summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-02-05 23:15:36 +0000
committerSam James <sam@gentoo.org>2024-02-05 23:16:32 +0000
commit102f79613e208193ade66e71ddf6530db3fadc05 (patch)
treeeaada7ae4543c9c12d1c16897328b9f5010a249f /dev-build/ninja
parentsys-libs/glibc: drop 2.37-r7, 2.37-r9, 2.38-r9 (diff)
downloadgentoo-102f79613e208193ade66e71ddf6530db3fadc05.tar.gz
gentoo-102f79613e208193ade66e71ddf6530db3fadc05.tar.bz2
gentoo-102f79613e208193ade66e71ddf6530db3fadc05.zip
dev-build/ninja: fix LFS (by respecting CPPFLAGS)
Reported by dilfridge w/ x86 build on XFS (which has larger inodes). See also 280be1cadfdfd607d422dcefa33e9f15bf9c638c. Bug: https://bugs.gentoo.org/760848 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-build/ninja')
-rw-r--r--dev-build/ninja/files/ninja-cppflags.patch21
-rw-r--r--dev-build/ninja/ninja-1.11.1-r5.ebuild118
-rw-r--r--dev-build/ninja/ninja-9999.ebuild1
3 files changed, 140 insertions, 0 deletions
diff --git a/dev-build/ninja/files/ninja-cppflags.patch b/dev-build/ninja/files/ninja-cppflags.patch
new file mode 100644
index 000000000000..375f6fce6045
--- /dev/null
+++ b/dev-build/ninja/files/ninja-cppflags.patch
@@ -0,0 +1,21 @@
+Needed for append-lfs-flags to work.
+--- a/configure.py
++++ b/configure.py
+@@ -261,7 +261,7 @@ configure_args = sys.argv[1:]
+ if '--bootstrap' in configure_args:
+ configure_args.remove('--bootstrap')
+ n.variable('configure_args', ' '.join(configure_args))
+-env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
++env_keys = set(['CXX', 'AR', 'CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'LDFLAGS'])
+ configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
+ if configure_env:
+ config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
+@@ -406,6 +406,8 @@ def shell_escape(str):
+ if 'CFLAGS' in configure_env:
+ cflags.append(configure_env['CFLAGS'])
+ ldflags.append(configure_env['CFLAGS'])
++if 'CPPFLAGS' in configure_env:
++ cflags.append(configure_env['CPPFLAGS'])
+ if 'CXXFLAGS' in configure_env:
+ cflags.append(configure_env['CXXFLAGS'])
+ ldflags.append(configure_env['CXXFLAGS'])
diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
new file mode 100644
index 000000000000..eae54565f9fc
--- /dev/null
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -0,0 +1,118 @@
+# 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
+ "${FILESDIR}"/ninja-cppflags.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
+}
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 4a9cf1f32132..eae54565f9fc 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -40,6 +40,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
+ "${FILESDIR}"/ninja-cppflags.patch
)
run_for_build() {