commit: 0553acbb90e9fcd50f169a257d1d220f4c5058e9 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 18:48:48 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 18:48:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0553acbb
dev-util/ninja: bump to 1.9.0 Closes: https://bugs.gentoo.org/682420 Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/ninja/Manifest | 1 + .../ninja/{ninja-9999.ebuild => ninja-1.9.0.ebuild} | 17 +++++++++++------ dev-util/ninja/ninja-9999.ebuild | 17 +++++++++++------ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest index acfcd0990c7..8de2b193c8e 100644 --- a/dev-util/ninja/Manifest +++ b/dev-util/ninja/Manifest @@ -1,3 +1,4 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 +DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812 diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild similarity index 82% copy from dev-util/ninja/ninja-9999.ebuild copy to dev-util/ninja/ninja-1.9.0.ebuild index 0f378c4dd3a..8eb95d5047f 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-1.9.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 2012-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs @@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"; else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1" + MY_P="ninja-${KITWARE_VERSION}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" fi @@ -47,9 +50,11 @@ run_for_build() { if tc-is-cross-compiler; then local -x AR=$(tc-getBUILD_AR) local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS=${BUILD_CXXFLAGS} + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} local -x LDFLAGS=${BUILD_LDFLAGS} fi + echo "$@" >&2 "$@" } @@ -59,7 +64,7 @@ src_compile() { # configure.py uses CFLAGS instead of CXXFLAGS export CFLAGS=${CXXFLAGS} - run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then mv ninja ninja-build || die @@ -82,7 +87,7 @@ src_test() { if ! tc-is-cross-compiler; then # Bug 485772 ulimit -n 2048 - ./ninja-build -v ninja_test || die + ./ninja -v ninja_test || die ./ninja_test || die fi } diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild index 0f378c4dd3a..8eb95d5047f 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 2012-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs @@ -11,7 +11,10 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"; else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1" + MY_P="ninja-${KITWARE_VERSION}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" fi @@ -47,9 +50,11 @@ run_for_build() { if tc-is-cross-compiler; then local -x AR=$(tc-getBUILD_AR) local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS=${BUILD_CXXFLAGS} + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} local -x LDFLAGS=${BUILD_LDFLAGS} fi + echo "$@" >&2 "$@" } @@ -59,7 +64,7 @@ src_compile() { # configure.py uses CFLAGS instead of CXXFLAGS export CFLAGS=${CXXFLAGS} - run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then mv ninja ninja-build || die @@ -82,7 +87,7 @@ src_test() { if ! tc-is-cross-compiler; then # Bug 485772 ulimit -n 2048 - ./ninja-build -v ninja_test || die + ./ninja -v ninja_test || die ./ninja_test || die fi }
