From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
Date: Fri, 16 Sep 2022 23:21:39 +0000 (UTC) [thread overview]
Message-ID: <1663370477.50f69bca7ad128cf735ba43039e872a7428b17b8.gyakovlev@gentoo> (raw)
commit: 50f69bca7ad128cf735ba43039e872a7428b17b8
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 23:21:17 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 23:21:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f69bca
sys-fs/zfs: drop unused patch
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/2.1.5-build-issues.patch | 74 -------------------------------
1 file changed, 74 deletions(-)
diff --git a/sys-fs/zfs/files/2.1.5-build-issues.patch b/sys-fs/zfs/files/2.1.5-build-issues.patch
deleted file mode 100644
index cca6561b16f7..000000000000
--- a/sys-fs/zfs/files/2.1.5-build-issues.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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;
next reply other threads:[~2022-09-16 23:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 23:21 Georgy Yakovlev [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 6:42 [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/ Sam James
2023-07-04 22:17 Conrad Kostecki
2022-09-23 20:15 Georgy Yakovlev
2021-12-16 2:55 Georgy Yakovlev
2020-09-21 23:04 Georgy Yakovlev
2020-06-10 23:49 Georgy Yakovlev
2019-11-26 21:25 Georgy Yakovlev
2015-10-01 23:02 Richard Yao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1663370477.50f69bca7ad128cf735ba43039e872a7428b17b8.gyakovlev@gentoo \
--to=gyakovlev@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox