diff options
author | 2024-10-10 09:30:13 +1000 | |
---|---|---|
committer | 2024-10-10 09:42:48 +1000 | |
commit | 7dc8db873e52b37c03548bb272f2a2f4c36aba16 (patch) | |
tree | 3b195c30d6cafb551b8ca78535fb8d5fb2ad6250 | |
parent | www-client/chromium: make rust profiler sanity check more reliable (diff) | |
download | gentoo-7dc8db873e52b37c03548bb272f2a2f4c36aba16.tar.gz gentoo-7dc8db873e52b37c03548bb272f2a2f4c36aba16.tar.bz2 gentoo-7dc8db873e52b37c03548bb272f2a2f4c36aba16.zip |
dev-build/gn: add 0.2200; update live
- Update patch to -r6
- drop `use elibc_musl` check; upstream dropped transitional LFS64 APIs
Signed-off-by: Matt Jolly <kangie@gentoo.org>
-rw-r--r-- | dev-build/gn/Manifest | 1 | ||||
-rw-r--r-- | dev-build/gn/files/gn-gen-r6.patch | 36 | ||||
-rw-r--r-- | dev-build/gn/gn-0.2200.ebuild | 66 | ||||
-rw-r--r-- | dev-build/gn/gn-9999.ebuild | 8 |
4 files changed, 105 insertions, 6 deletions
diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest index 99a4ae55e822..d5f7e87682bf 100644 --- a/dev-build/gn/Manifest +++ b/dev-build/gn/Manifest @@ -3,3 +3,4 @@ DIST gn-0.2143.tar.xz 742220 BLAKE2B bfc33c4f323e9a7182c57c0c832866b48ae0877cfc1 DIST gn-0.2154.tar.xz 746968 BLAKE2B 2d1b29e183d7ebb37bee322b3dff367a019c03ef9a7f5bcb258d54dc232dda1ad0ec75eb11685851192630922f4df2d6f5f0d0108cc2551b0e6b96e7fbade360 SHA512 8bb0f4da180297d0d04b1c6fc83e1508343ff43f1b9d6b38825f59cb3cb496ca452870f7b0c27bb041a0d429a80da47f2579afa7526d24221b12e4894905b67f DIST gn-0.2157.tar.xz 747636 BLAKE2B 85080f87ef42416d242034ae68276263d9a0d5020fd78471fe1f8c41fd092cb66df23725062465fa54de019acf846660a4527a0e3759b55136450d1de8a2f65d SHA512 f51621dff061c5c265c997d4326d6429f3a5763ffa50f4644fb7b9e1fa9b787497f21209449413b97fe589ee3e5a90253938ed63a987c311028666ce89500fdc DIST gn-0.2165.tar.xz 748624 BLAKE2B 6c966fa5791c069bfd790926db7c986a8831f29819e8d7121fe9a30d4f870897064900479ecd620134f2549f30d888efc748da87b7246f12905c3c53ac4a0b7a SHA512 6d99c92e951595f6e0168fea20765d31605485dea4aeec1a0c5d225223f809da2b025f8e09523d5f4a607ffb9f30118503ee4d990cc31d174c6edf6bce384f87 +DIST gn-0.2200.tar.xz 753048 BLAKE2B 9c57e21a5cab2a5df92aee78baacb8260de0793689a3ac743428d16e5b48cdd48de0a81fa137947ed1be0b54e1751748777488d2ca68377baa1a0d02f27e9819 SHA512 bef69e706078617a4ec45cba978a4ba01a2a9b6ddc0bd91697fca2712529f030febf2d12dbb26a432c6ec43af249b708ec0800d01e059bc6ebc26069e0ef8a56 diff --git a/dev-build/gn/files/gn-gen-r6.patch b/dev-build/gn/files/gn-gen-r6.patch new file mode 100644 index 000000000000..194bf2477249 --- /dev/null +++ b/dev-build/gn/files/gn-gen-r6.patch @@ -0,0 +1,36 @@ +From 60f253dbba70f2146f7226e476030a5b6074e1ac Mon Sep 17 00:00:00 2001 +From: Matt Jolly <kangie@gentoo.org> +Date: Thu, 10 Oct 2024 09:28:20 +1000 +Subject: [PATCH] Update patch to v6 + +--- + build/gen.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/gen.py b/build/gen.py +index d1c649c..1fc5b4d 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -431,11 +431,6 @@ def WriteGNNinja(path, platform, host, options, args_list): + if not platform.is_darwin(): + cflags.extend(['-D_LIBCPP_DEBUG=1', '-D_GLIBCXX_DEBUG=1']) + else: +- cflags.append('-DNDEBUG') +- cflags.append('-O3') +- if options.no_strip: +- cflags.append('-g') +- ldflags.append('-O3') + # Use -fdata-sections and -ffunction-sections to place each function + # or data item into its own section so --gc-sections can eliminate any + # unused functions and data items. +@@ -482,7 +477,6 @@ def WriteGNNinja(path, platform, host, options, args_list): + '-D_FILE_OFFSET_BITS=64', + '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS', + '-pthread', +- '-pipe', + '-fno-exceptions', + '-fno-rtti', + '-fdiagnostics-color', +-- +2.46.2 + diff --git a/dev-build/gn/gn-0.2200.ebuild b/dev-build/gn/gn-0.2200.ebuild new file mode 100644 index 000000000000..a252da4d6f3f --- /dev/null +++ b/dev-build/gn/gn-0.2200.ebuild @@ -0,0 +1,66 @@ +# Copyright 2018-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit edo ninja-utils python-any-r1 toolchain-funcs + +DESCRIPTION="GN is a meta-build system that generates build files for Ninja" +HOMEPAGE="https://gn.googlesource.com/" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gn.googlesource.com/gn" +else + # The version number is derived from `git describe HEAD --abbrev=12` + SRC_URI="https://deps.gentoo.zip/dev-build/gn/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="BSD" +SLOT="0" + +BDEPEND=" + ${PYTHON_DEPS} + app-alternatives/ninja +" + +PATCHES=( + "${FILESDIR}"/gn-gen-r6.patch +) + +pkg_setup() { + : +} + +src_configure() { + python_setup + tc-export AR CC CXX + unset CFLAGS + set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings + edo "$@" + cat >out/last_commit_position.h <<-EOF || die + #ifndef OUT_LAST_COMMIT_POSITION_H_ + #define OUT_LAST_COMMIT_POSITION_H_ + #define LAST_COMMIT_POSITION_NUM ${PV##0.} + #define LAST_COMMIT_POSITION "${PV}" + #endif // OUT_LAST_COMMIT_POSITION_H_ + EOF +} + +src_compile() { + eninja -C out gn +} + +src_test() { + eninja -C out gn_unittests + out/gn_unittests || die +} + +src_install() { + dobin out/gn + einstalldocs + + insinto /usr/share/vim/vimfiles + doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax} +} diff --git a/dev-build/gn/gn-9999.ebuild b/dev-build/gn/gn-9999.ebuild index 5dea03c85f58..a252da4d6f3f 100644 --- a/dev-build/gn/gn-9999.ebuild +++ b/dev-build/gn/gn-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit edo ninja-utils python-any-r1 toolchain-funcs @@ -26,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/gn-gen-r5.patch + "${FILESDIR}"/gn-gen-r6.patch ) pkg_setup() { @@ -36,10 +36,6 @@ pkg_setup() { src_configure() { python_setup tc-export AR CC CXX - if use elibc_musl ; then # bug 906362 - export CC="${CC} -D_LARGEFILE64_SOURCE" - export CXX="${CXX} -D_LARGEFILE64_SOURCE" - fi unset CFLAGS set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings edo "$@" |