commit: 8d950bb026385484a5aba5726ce0a93ec5c24339 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Mon Jul 4 04:50:36 2022 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Mon Jul 4 04:50:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d950bb0
sys-kernel/genkernel: update for newer boost Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Closes: https://bugs.gentoo.org/854480 sys-kernel/genkernel/Manifest | 1 + .../files/genkernel-4.2.6-boost-optim.patch | 23 ++++++++++++++++++++++ ...ernel-9999.ebuild => genkernel-4.2.6-r4.ebuild} | 13 ++++++++---- sys-kernel/genkernel/genkernel-9999.ebuild | 5 ++++- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index 3a4f34d67577..788ef1989104 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -3,6 +3,7 @@ DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671a DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 +DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6 diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch new file mode 100644 index 000000000000..356202ddc095 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch @@ -0,0 +1,23 @@ +commit 8b7422293dcf9cc62518dcbc49239b6e637b6b74 +Author: Robin H. Johnson <robb...@gentoo.org> +Date: Sun Jul 3 21:46:21 2022 -0700 + + gkbuilds/boost-build.gkbuild: upstream boost flags changed + + Upstream boost changed the flags to use 'off' instead of 'none'. + + Signed-off-by: Robin H. Johnson <robb...@gentoo.org> + Closes: https://bugs.gentoo.org/854480 + +diff --git gkbuilds/boost-build.gkbuild gkbuilds/boost-build.gkbuild +index 03d1f88..0e06ba7 100644 +--- gkbuilds/boost-build.gkbuild ++++ gkbuilds/boost-build.gkbuild +@@ -53,6 +53,6 @@ src_install() { + find "${D}/usr/share/boost-build" -iname "*.py" -delete \ + || die "Failed to remove python files" + +- echo 'variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \ ++ echo 'variant gentoorelease : release : <optimization>off <debug-symbols>off <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \ + || die "Failed to create '${D}/usr/share/boost-build/site-config.jam'!" + } diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild similarity index 97% copy from sys-kernel/genkernel/genkernel-9999.ebuild copy to sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild index b9c6dd2c0ebd..6ad1250b75b1 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # genkernel-9999 -> latest Git branch "master" @@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1 # Whenever you bump a GKPKG, check if you have to move # or add new patches! VERSION_BCACHE_TOOLS="1.0.8_p20141204" -VERSION_BOOST="1.76.0" +VERSION_BOOST="1.79.0" VERSION_BTRFS_PROGS="5.15" VERSION_BUSYBOX="1.34.1" VERSION_COREUTILS="8.32" @@ -45,7 +45,6 @@ VERSION_XFSPROGS="5.13.0" VERSION_XZ="5.2.5" VERSION_ZLIB="1.2.11" VERSION_ZSTD="1.5.0" -VERSION_KEYUTILS="1.6.3" COMMON_URI=" https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz @@ -81,7 +80,6 @@ COMMON_URI=" https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz - https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz " if [[ ${PV} == 9999* ]] ; then @@ -128,6 +126,13 @@ if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc" fi +PATCHES=( + "${FILESDIR}"/${P}-devicemanager.patch + "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch + "${FILESDIR}"/${P}-fuse-glibc-2.34.patch + "${FILESDIR}"/${P}-gcc-12-boost-1.79.patch +) + src_unpack() { if [[ ${PV} == 9999* ]]; then git-r3_src_unpack diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index b9c6dd2c0ebd..db61d4ca5c50 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1 # Whenever you bump a GKPKG, check if you have to move # or add new patches! VERSION_BCACHE_TOOLS="1.0.8_p20141204" -VERSION_BOOST="1.76.0" +VERSION_BOOST="1.79.0" VERSION_BTRFS_PROGS="5.15" VERSION_BUSYBOX="1.34.1" VERSION_COREUTILS="8.32" @@ -128,6 +128,9 @@ if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc" fi +PATCHES=( +) + src_unpack() { if [[ ${PV} == 9999* ]]; then git-r3_src_unpack
