| 1 |
commit: 8d950bb026385484a5aba5726ce0a93ec5c24339 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 4 04:50:36 2022 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 4 04:50:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d950bb0 |
| 7 |
|
| 8 |
sys-kernel/genkernel: update for newer boost |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
Closes: https://bugs.gentoo.org/854480 |
| 12 |
|
| 13 |
sys-kernel/genkernel/Manifest | 1 + |
| 14 |
.../files/genkernel-4.2.6-boost-optim.patch | 23 ++++++++++++++++++++++ |
| 15 |
...ernel-9999.ebuild => genkernel-4.2.6-r4.ebuild} | 13 ++++++++---- |
| 16 |
sys-kernel/genkernel/genkernel-9999.ebuild | 5 ++++- |
| 17 |
4 files changed, 37 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest |
| 20 |
index 3a4f34d67577..788ef1989104 100644 |
| 21 |
--- a/sys-kernel/genkernel/Manifest |
| 22 |
+++ b/sys-kernel/genkernel/Manifest |
| 23 |
@@ -3,6 +3,7 @@ DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671a |
| 24 |
DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9 SHA512 53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54 |
| 25 |
DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668 |
| 26 |
DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 |
| 27 |
+DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 |
| 28 |
DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5 |
| 29 |
DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 |
| 30 |
DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6 |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 000000000000..356202ddc095 |
| 35 |
--- /dev/null |
| 36 |
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-boost-optim.patch |
| 37 |
@@ -0,0 +1,23 @@ |
| 38 |
+commit 8b7422293dcf9cc62518dcbc49239b6e637b6b74 |
| 39 |
+Author: Robin H. Johnson <robbat2@g.o> |
| 40 |
+Date: Sun Jul 3 21:46:21 2022 -0700 |
| 41 |
+ |
| 42 |
+ gkbuilds/boost-build.gkbuild: upstream boost flags changed |
| 43 |
+ |
| 44 |
+ Upstream boost changed the flags to use 'off' instead of 'none'. |
| 45 |
+ |
| 46 |
+ Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 47 |
+ Closes: https://bugs.gentoo.org/854480 |
| 48 |
+ |
| 49 |
+diff --git gkbuilds/boost-build.gkbuild gkbuilds/boost-build.gkbuild |
| 50 |
+index 03d1f88..0e06ba7 100644 |
| 51 |
+--- gkbuilds/boost-build.gkbuild |
| 52 |
++++ gkbuilds/boost-build.gkbuild |
| 53 |
+@@ -53,6 +53,6 @@ src_install() { |
| 54 |
+ find "${D}/usr/share/boost-build" -iname "*.py" -delete \ |
| 55 |
+ || die "Failed to remove python files" |
| 56 |
+ |
| 57 |
+- echo 'variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \ |
| 58 |
++ echo 'variant gentoorelease : release : <optimization>off <debug-symbols>off <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \ |
| 59 |
+ || die "Failed to create '${D}/usr/share/boost-build/site-config.jam'!" |
| 60 |
+ } |
| 61 |
|
| 62 |
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild |
| 63 |
similarity index 97% |
| 64 |
copy from sys-kernel/genkernel/genkernel-9999.ebuild |
| 65 |
copy to sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild |
| 66 |
index b9c6dd2c0ebd..6ad1250b75b1 100644 |
| 67 |
--- a/sys-kernel/genkernel/genkernel-9999.ebuild |
| 68 |
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r4.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2021 Gentoo Authors |
| 71 |
+# Copyright 1999-2022 Gentoo Authors |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
# genkernel-9999 -> latest Git branch "master" |
| 75 |
@@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1 |
| 76 |
# Whenever you bump a GKPKG, check if you have to move |
| 77 |
# or add new patches! |
| 78 |
VERSION_BCACHE_TOOLS="1.0.8_p20141204" |
| 79 |
-VERSION_BOOST="1.76.0" |
| 80 |
+VERSION_BOOST="1.79.0" |
| 81 |
VERSION_BTRFS_PROGS="5.15" |
| 82 |
VERSION_BUSYBOX="1.34.1" |
| 83 |
VERSION_COREUTILS="8.32" |
| 84 |
@@ -45,7 +45,6 @@ VERSION_XFSPROGS="5.13.0" |
| 85 |
VERSION_XZ="5.2.5" |
| 86 |
VERSION_ZLIB="1.2.11" |
| 87 |
VERSION_ZSTD="1.5.0" |
| 88 |
-VERSION_KEYUTILS="1.6.3" |
| 89 |
|
| 90 |
COMMON_URI=" |
| 91 |
https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz |
| 92 |
@@ -81,7 +80,6 @@ COMMON_URI=" |
| 93 |
https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz |
| 94 |
https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz |
| 95 |
https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz |
| 96 |
- https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz |
| 97 |
" |
| 98 |
|
| 99 |
if [[ ${PV} == 9999* ]] ; then |
| 100 |
@@ -128,6 +126,13 @@ if [[ ${PV} == 9999* ]]; then |
| 101 |
DEPEND="${DEPEND} app-text/asciidoc" |
| 102 |
fi |
| 103 |
|
| 104 |
+PATCHES=( |
| 105 |
+ "${FILESDIR}"/${P}-devicemanager.patch |
| 106 |
+ "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch |
| 107 |
+ "${FILESDIR}"/${P}-fuse-glibc-2.34.patch |
| 108 |
+ "${FILESDIR}"/${P}-gcc-12-boost-1.79.patch |
| 109 |
+) |
| 110 |
+ |
| 111 |
src_unpack() { |
| 112 |
if [[ ${PV} == 9999* ]]; then |
| 113 |
git-r3_src_unpack |
| 114 |
|
| 115 |
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild |
| 116 |
index b9c6dd2c0ebd..db61d4ca5c50 100644 |
| 117 |
--- a/sys-kernel/genkernel/genkernel-9999.ebuild |
| 118 |
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild |
| 119 |
@@ -13,7 +13,7 @@ inherit bash-completion-r1 python-single-r1 |
| 120 |
# Whenever you bump a GKPKG, check if you have to move |
| 121 |
# or add new patches! |
| 122 |
VERSION_BCACHE_TOOLS="1.0.8_p20141204" |
| 123 |
-VERSION_BOOST="1.76.0" |
| 124 |
+VERSION_BOOST="1.79.0" |
| 125 |
VERSION_BTRFS_PROGS="5.15" |
| 126 |
VERSION_BUSYBOX="1.34.1" |
| 127 |
VERSION_COREUTILS="8.32" |
| 128 |
@@ -128,6 +128,9 @@ if [[ ${PV} == 9999* ]]; then |
| 129 |
DEPEND="${DEPEND} app-text/asciidoc" |
| 130 |
fi |
| 131 |
|
| 132 |
+PATCHES=( |
| 133 |
+) |
| 134 |
+ |
| 135 |
src_unpack() { |
| 136 |
if [[ ${PV} == 9999* ]]; then |
| 137 |
git-r3_src_unpack |
Archives