gentoo resync : 09.07.2022

3 files changed, 81 insertions, 1 deletions

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b216ab711d34..cd44b8b5c2de 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,4 +1,5 @@
 AUX 2.1.4-ZERO_RANGE.patch 9454 BLAKE2B 5baaef961eb75ee0b46ccb89a514612795b829fe410da1587330f81c2d9550c3fc049f32952e3d67d06a80a3fcc69fe9121fc9f44c1f467570f2d81f1f3a5386 SHA512 95558f6de1b901cdcd7aaa0cc704bf75375a39a5d89da02a0665494a84646f9974e0bc8ff869b622a3a7031db279ff76029ebc33ec1f5f8a129b560ffa565349
+AUX 2.1.5-build-issues.patch 2262 BLAKE2B 6d7540c2b8f97ba1a4e84109cda702cb6dd78b89979e757ffe7b7ce6ed98792daae0b56696dfbf264c772d2a90836a9ad5786ca81c13737cb2a5f6a6eb50e7dc SHA512 1b1e8e29db530c16385e8461a0f068cf2cbcd08f347d516ffecf26c3c995e20f454b8a77a380bce5b789ab6d5fd83a77c45d4f356532a6144cdf230cc38c9672
 DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
 DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
 DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e
@@ -7,6 +8,6 @@ DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786 SHA512 224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
 EBUILD zfs-kmod-2.0.7.ebuild 5623 BLAKE2B fdd099d7a5c1c62b0976883d4294eb5175681cc422724cbe8fecfa15fa220741098f919666e8ccaba21751689f380ae6869fd63c2d9098b117f8c0c465963dd9 SHA512 54908f2ec0c95dd4705837d7c36797fab15764ff3895337ad9f22f963024f5d4feb41962705bd81e34173b0e5901b56cac1197c734308d23f682953a11c931df
 EBUILD zfs-kmod-2.1.4-r1.ebuild 5292 BLAKE2B b773adbd308aeffac068e0dc4e8055e2ca601efe6440091a8ae82606a3bb7806df171c067dcfec4fef54e77882a7c07bbb8cac9b10fa15107d6ca24643279169 SHA512 7426f4adb9312930bfb07828d512148279dd2b935f7ed796c792b52564afef938efe830df1141cc3a94b5949551f1ca74567ef65beca41ae9cc0cf73fe1ff3df
-EBUILD zfs-kmod-2.1.5.ebuild 5244 BLAKE2B 72cc9bf7af52f3172d06354d6faf2c9e76482421ae56a395dab6445b71a3bfc19da994f57d853c2b2a626384a544b07a398b642c7f27f3fa6e9d3c3c7ffc43fc SHA512 d09b9c8c101d2e8260b38376e2ba94e2e86900fe60fdb56bbefc4ff1292c2aa9250f7d7de37eb2b9a49fbd51500f33306d3083a429eb7c0ca90d593e82e3e147
+EBUILD zfs-kmod-2.1.5.ebuild 5312 BLAKE2B 7aa4ac7df6885f0aac60501d270602cf83bb1b5e4db3d0173308cd4b1c0bed4ffcb229a0a52e8739ad08c90d78c214f55931af084fa4c83e69dc14d8fdc96e35 SHA512 e6b62ad35b18cf8f24fba2f499e47b570a3b4fb2065fb79aec91ef3da30236f4d69c57b0a1ca62a99a99cb840eb3e0280285bddbd6555416d59783ce566ed995
 EBUILD zfs-kmod-9999.ebuild 5244 BLAKE2B 72cc9bf7af52f3172d06354d6faf2c9e76482421ae56a395dab6445b71a3bfc19da994f57d853c2b2a626384a544b07a398b642c7f27f3fa6e9d3c3c7ffc43fc SHA512 d09b9c8c101d2e8260b38376e2ba94e2e86900fe60fdb56bbefc4ff1292c2aa9250f7d7de37eb2b9a49fbd51500f33306d3083a429eb7c0ca90d593e82e3e147
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
new file mode 100644
index 000000000000..cca6561b16f7
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/2.1.5-build-issues.patch
@@ -0,0 +1,74 @@
+https://github.com/openzfs/zfs/commit/a6e8113fed8a508ffda13cf1c4d8da99a4e8133a
+https://github.com/openzfs/zfs/commit/60e389ca10085acfa7cd35f79ab4465d968a942f
+Cherry-picked from https://github.com/openzfs/zfs/pull/13575
+
+https://bugs.gentoo.org/855182
+--- a/config/always-compiler-options.m4
++++ b/config/always-compiler-options.m4
+@@ -205,6 +205,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER], [
+ 	AC_SUBST([NO_OMIT_FRAME_POINTER])
+ ])
+ 
++dnl #
++dnl # Check if cc supports -Winfinite-recursion option.
++dnl #
++AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION], [
++	AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
++
++	saved_flags="$CFLAGS"
++	CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
++
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
++		INFINITE_RECURSION=-Winfinite-recursion
++		AC_DEFINE([HAVE_INFINITE_RECURSION], 1,
++			[Define if compiler supports -Winfinite-recursion])
++		AC_MSG_RESULT([yes])
++	], [
++		INFINITE_RECURSION=
++		AC_MSG_RESULT([no])
++	])
++
++	CFLAGS="$saved_flags"
++	AC_SUBST([INFINITE_RECURSION])
++])
++
+ dnl #
+ dnl # Check if cc supports -fno-ipa-sra option.
+ dnl #
+--- a/config/zfs-build.m4
++++ b/config/zfs-build.m4
+@@ -211,6 +211,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
+ 
+ 	ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
+ 	ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
++	ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
+ 	ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
+ 	ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
+ 	ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
+--- a/module/lua/ldo.c
++++ b/module/lua/ldo.c
+@@ -168,6 +168,13 @@ static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
+   L->top = oldtop + 1;
+ }
+ 
++/*
++ * Silence infinite recursion warning which was added to -Wall in gcc 12.1
++ */
++#if defined(HAVE_INFINITE_RECURSION)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Winfinite-recursion"
++#endif
+ 
+ l_noret luaD_throw (lua_State *L, int errcode) {
+   if (L->errorJmp) {  /* thread has an error handler? */
+@@ -190,6 +197,10 @@ l_noret luaD_throw (lua_State *L, int errcode) {
+   }
+ }
+ 
++#if defined(HAVE_INFINITE_RECURSION)
++#pragma GCC diagnostic pop
++#endif
++
+ 
+ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+   unsigned short oldnCcalls = L->nCcalls;
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
index 65567e49fef7..ac917091d0b4 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild
@@ -62,6 +62,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=(
+	# bug #855182
+	"${FILESDIR}"/${PV}-build-issues.patch
+)
+
 pkg_pretend() {
 	use rootfs || return 0