mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-27 00:21:44 +02:00
dev-build/ninja: Sync with Gentoo
It's from Gentoo commit 9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
2cd5b0f5fb
commit
a27ac130ae
@ -1,21 +0,0 @@
|
||||
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'])
|
||||
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
@ -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
|
||||
}
|
||||
@ -5,7 +5,7 @@ EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
|
||||
inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
|
||||
@ -40,7 +40,6 @@ PDEPEND="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/ninja-cflags.patch
|
||||
"${FILESDIR}"/ninja-cppflags.patch
|
||||
)
|
||||
|
||||
run_for_build() {
|
||||
@ -48,7 +47,7 @@ run_for_build() {
|
||||
local -x AR=$(tc-getBUILD_AR)
|
||||
local -x CXX=$(tc-getBUILD_CXX)
|
||||
local -x CFLAGS=
|
||||
local -x CXXFLAGS=${BUILD_CXXFLAGS}
|
||||
local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
|
||||
local -x LDFLAGS=${BUILD_LDFLAGS}
|
||||
fi
|
||||
echo "$@" >&2
|
||||
@ -61,7 +60,7 @@ src_compile() {
|
||||
# configure.py appends CFLAGS to CXXFLAGS
|
||||
unset CFLAGS
|
||||
|
||||
append-lfs-flags
|
||||
local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
|
||||
inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
|
||||
@ -40,7 +40,6 @@ PDEPEND="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/ninja-cflags.patch
|
||||
"${FILESDIR}"/ninja-cppflags.patch
|
||||
)
|
||||
|
||||
run_for_build() {
|
||||
@ -48,7 +47,7 @@ run_for_build() {
|
||||
local -x AR=$(tc-getBUILD_AR)
|
||||
local -x CXX=$(tc-getBUILD_CXX)
|
||||
local -x CFLAGS=
|
||||
local -x CXXFLAGS=${BUILD_CXXFLAGS}
|
||||
local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
|
||||
local -x LDFLAGS=${BUILD_LDFLAGS}
|
||||
fi
|
||||
echo "$@" >&2
|
||||
@ -61,7 +60,7 @@ src_compile() {
|
||||
# configure.py appends CFLAGS to CXXFLAGS
|
||||
unset CFLAGS
|
||||
|
||||
append-lfs-flags
|
||||
local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
|
||||
|
||||
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user