From 3980ecf15e6202ac2f2015045b549600e709b721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Oct 2024 04:04:10 +0100 Subject: gentoo auto-resync : 12:10:2024 - 04:04:10 --- dev-build/Manifest.gz | Bin 7043 -> 7043 bytes dev-build/gn/Manifest | 6 ++-- dev-build/gn/files/gn-gen-r6.patch | 36 -------------------- dev-build/gn/files/gn-gen-r7.patch | 39 ++++++++++++++++++++++ dev-build/gn/gn-0.2200-r1.ebuild | 66 +++++++++++++++++++++++++++++++++++++ dev-build/gn/gn-0.2200.ebuild | 66 ------------------------------------- dev-build/gn/gn-9999.ebuild | 2 +- 7 files changed, 109 insertions(+), 106 deletions(-) delete mode 100644 dev-build/gn/files/gn-gen-r6.patch create mode 100644 dev-build/gn/files/gn-gen-r7.patch create mode 100644 dev-build/gn/gn-0.2200-r1.ebuild delete mode 100644 dev-build/gn/gn-0.2200.ebuild (limited to 'dev-build') diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz index d4453f3534c6..68be873f15b7 100644 Binary files a/dev-build/Manifest.gz and b/dev-build/Manifest.gz differ diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest index c7cba001b3ef..6923359a6111 100644 --- a/dev-build/gn/Manifest +++ b/dev-build/gn/Manifest @@ -1,5 +1,5 @@ AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971 -AUX gn-gen-r6.patch 1204 BLAKE2B 81b43733d89ba65a42f136262643aab564a9ed0561ba8b9ed11770f51d56af84ed1d5f0b1530407133e46d51a59b8b5d4585cadef2d713c50317ad6e38a17a1f SHA512 e0f0550f2bd7dd405de523e6995b8b6bc4a6e58b9ab7d1a126a45e30d32880f480b27dd5270b0422f0bda1ab75a8f6d38044ee0ec75585ad9cc7a38494c665fb +AUX gn-gen-r7.patch 1309 BLAKE2B b4976f163f963acdbd021a2f76661fd3f347d402b654ca9af1aa1f4be493d705e9842f106bbe7693ecf6d35722eeb76c5de5f014ada0bc37bf5d4d09f900abc5 SHA512 af829f2ca27b2a66867bb2589e9b37eb209013a2f3b5c4f0304c6dcd389e6356a0361b536b8b35c04d7435a3b84e415ae24444bb78e662f12028542c8b8df9c6 DIST gn-0.2122.tar.xz 740444 BLAKE2B df57fb611f26964ed3ac47365080cd043ba4206233450bb39699e78e35b8acff918e94efe4e7cea957199dd2f441dfcf31566e7d64ad10aace9d2c1d538ed6ac SHA512 80c330eac876fc0d6f46038b96eefd19bc1b6e5e89515489c1d02f82675213174fba394398ffc1bdd1405ddcd11b60c2870f3076296390976da74012867faf39 DIST gn-0.2143.tar.xz 742220 BLAKE2B bfc33c4f323e9a7182c57c0c832866b48ae0877cfc1eeb42518a97ac6a64ab70e5bc81855f1c5201a49a7842e284b7a9042e1666f79c6182539076cfef6bb128 SHA512 8450947abf904faf47951ebb8336f4e2c54cb50fd6044750206a0d2a4284107670aeaec9d520374dfdb8baa1ca3b6dae5158ae564dcd40a2898f3614c003e7eb DIST gn-0.2154.tar.xz 746968 BLAKE2B 2d1b29e183d7ebb37bee322b3dff367a019c03ef9a7f5bcb258d54dc232dda1ad0ec75eb11685851192630922f4df2d6f5f0d0108cc2551b0e6b96e7fbade360 SHA512 8bb0f4da180297d0d04b1c6fc83e1508343ff43f1b9d6b38825f59cb3cb496ca452870f7b0c27bb041a0d429a80da47f2579afa7526d24221b12e4894905b67f @@ -11,6 +11,6 @@ EBUILD gn-0.2143.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af7 EBUILD gn-0.2154.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02 EBUILD gn-0.2157.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36 EBUILD gn-0.2165.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36 -EBUILD gn-0.2200.ebuild 1422 BLAKE2B 02b008909516785fbe18c6d929f53c841fcdeb765115b1dc1d536d0ba767198e28fda19cbe58aada657aee2fcfa26e853ebcff5fc6f2289d219f67f2ebeea02b SHA512 30d7348a1902e72d2431e66b4ba3646972464f9d962a1f94fc41c883c3fae6fe9c46ebac1e41e6e1a7a7325218f999002e3517b67f1fea858793fa1b72dddca2 -EBUILD gn-9999.ebuild 1422 BLAKE2B 02b008909516785fbe18c6d929f53c841fcdeb765115b1dc1d536d0ba767198e28fda19cbe58aada657aee2fcfa26e853ebcff5fc6f2289d219f67f2ebeea02b SHA512 30d7348a1902e72d2431e66b4ba3646972464f9d962a1f94fc41c883c3fae6fe9c46ebac1e41e6e1a7a7325218f999002e3517b67f1fea858793fa1b72dddca2 +EBUILD gn-0.2200-r1.ebuild 1422 BLAKE2B a6f2f5d60d6b17eb96140641fad1fa7fef3a128540c1abd7e56513339eb63531a51dd3534c950e02029e6f8bbad991cf910ea16ed09c7f40a50a50689729394f SHA512 57ad47f649d237ed01407294533efbae4d3fec80542ddff2985837be3d04e3d98f223ec35af80667da3183c865fe2009d035046787580fa033c2bd29d041636d +EBUILD gn-9999.ebuild 1422 BLAKE2B a6f2f5d60d6b17eb96140641fad1fa7fef3a128540c1abd7e56513339eb63531a51dd3534c950e02029e6f8bbad991cf910ea16ed09c7f40a50a50689729394f SHA512 57ad47f649d237ed01407294533efbae4d3fec80542ddff2985837be3d04e3d98f223ec35af80667da3183c865fe2009d035046787580fa033c2bd29d041636d MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf diff --git a/dev-build/gn/files/gn-gen-r6.patch b/dev-build/gn/files/gn-gen-r6.patch deleted file mode 100644 index 194bf2477249..000000000000 --- a/dev-build/gn/files/gn-gen-r6.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60f253dbba70f2146f7226e476030a5b6074e1ac Mon Sep 17 00:00:00 2001 -From: Matt Jolly -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/files/gn-gen-r7.patch b/dev-build/gn/files/gn-gen-r7.patch new file mode 100644 index 000000000000..f49236021406 --- /dev/null +++ b/dev-build/gn/files/gn-gen-r7.patch @@ -0,0 +1,39 @@ +From 74f21d84b06e63cd558a5e69f8195b5f93230a2f Mon Sep 17 00:00:00 2001 +From: Matt Jolly +Date: Thu, 10 Oct 2024 12:23:12 +1000 +Subject: [PATCH] Update patch to v7 + +--- + build/gen.py | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/build/gen.py b/build/gen.py +index d1c649cb..104ce569 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -432,10 +432,10 @@ def WriteGNNinja(path, platform, host, options, args_list): + 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') ++# 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 +482,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-r1.ebuild b/dev-build/gn/gn-0.2200-r1.ebuild new file mode 100644 index 000000000000..dfc6073b0e1a --- /dev/null +++ b/dev-build/gn/gn-0.2200-r1.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-r7.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-0.2200.ebuild b/dev-build/gn/gn-0.2200.ebuild deleted file mode 100644 index a252da4d6f3f..000000000000 --- a/dev-build/gn/gn-0.2200.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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 a252da4d6f3f..dfc6073b0e1a 100644 --- a/dev-build/gn/gn-9999.ebuild +++ b/dev-build/gn/gn-9999.ebuild @@ -26,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/gn-gen-r6.patch + "${FILESDIR}"/gn-gen-r7.patch ) pkg_setup() { -- cgit v1.2.3