From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 68F3B1382C5 for ; Mon, 15 Jun 2020 01:57:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3EB2E0AD6; Mon, 15 Jun 2020 01:57:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7CF4E0AD6 for ; Mon, 15 Jun 2020 01:57:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8877234F0D7 for ; Mon, 15 Jun 2020 01:57:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 793C42A4 for ; Mon, 15 Jun 2020 01:57:37 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1592184882.203248c352c50316ef86dc24f1637c77f9ae302a.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: patches/open-iscsi/2.0.878/ X-VCS-Repository: proj/genkernel X-VCS-Files: patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch X-VCS-Directories: patches/open-iscsi/2.0.878/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 203248c352c50316ef86dc24f1637c77f9ae302a X-VCS-Branch: master Date: Mon, 15 Jun 2020 01:57:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7be5b011-d09a-4091-9b2d-02582c240059 X-Archives-Hash: b2de8938486e584574c4e9b2926dc6e6 commit: 203248c352c50316ef86dc24f1637c77f9ae302a Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jun 15 01:34:42 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jun 15 01:34:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=203248c3 open-iscsi: Allow building against gcc-10 Signed-off-by: Thomas Deutschmann gentoo.org> .../2.0.878/open-iscsi-2.0.878-gcc-10.patch | 107 +++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch new file mode 100644 index 0000000..b614765 --- /dev/null +++ b/patches/open-iscsi/2.0.878/open-iscsi-2.0.878-gcc-10.patch @@ -0,0 +1,107 @@ +From 499a006a7d6bb154f9e1ab430e4c9e231ba6096a Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Tue, 28 Jan 2020 16:36:56 -0800 +Subject: [PATCH] Updates to support gcc -fno-common option. + +This meant cleaning up the definition of some +global variables, so that they were only defined +in one place and refered to as external elsewhere. +--- + include/iscsi_err.h | 6 ++++-- + iscsiuio/configure.ac | 2 +- + iscsiuio/src/uip/uip.h | 4 ++-- + usr/iscsi_err.c | 2 ++ + usr/log.c | 1 + + usr/log.h | 2 +- + 6 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/include/iscsi_err.h b/include/iscsi_err.h +index ed000dd0..04a8723e 100644 +--- a/include/iscsi_err.h ++++ b/include/iscsi_err.h +@@ -4,7 +4,7 @@ + #ifndef _ISCSI_ERR_ + #define _ISCSI_ERR_ + +-enum { ++enum iscsi_error_list { + ISCSI_SUCCESS = 0, + /* Generic error */ + ISCSI_ERR = 1, +@@ -73,7 +73,9 @@ enum { + + /* Always last. Indicates end of error code space */ + ISCSI_MAX_ERR_VAL, +-} iscsi_err; ++}; ++ ++extern enum iscsi_error_list iscsi_err; + + extern void iscsi_err_print_msg(int err); + extern char *iscsi_err_to_str(int err); +diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac +index b41df0ec..8099f09c 100644 +--- a/iscsiuio/configure.ac ++++ b/iscsiuio/configure.ac +@@ -78,7 +78,7 @@ AC_CONFIG_COMMANDS([default],[[ + else + echo 'char *build_date = "'`date`'";' > src/unix/build_date.c + fi +- echo 'char *build_date;'> src/unix/build_date.h ++ echo 'extern char *build_date;'> src/unix/build_date.h + ]],[[]]) + + AC_PREFIX_DEFAULT() +diff --git a/iscsiuio/src/uip/uip.h b/iscsiuio/src/uip/uip.h +index 1180ab50..9d9428a2 100644 +--- a/iscsiuio/src/uip/uip.h ++++ b/iscsiuio/src/uip/uip.h +@@ -70,8 +70,8 @@ struct uip_stack; + typedef u16_t uip_ip4addr_t[2]; + typedef u16_t uip_ip6addr_t[8]; + +-const uip_ip6addr_t all_zeroes_addr6; +-const uip_ip4addr_t all_zeroes_addr4; ++extern const uip_ip6addr_t all_zeroes_addr6; ++extern const uip_ip4addr_t all_zeroes_addr4; + + #define ETH_BUF(buf) ((struct uip_eth_hdr *)buf) + #define VLAN_ETH_BUF(buf) ((struct uip_vlan_eth_hdr *)buf) +diff --git a/usr/iscsi_err.c b/usr/iscsi_err.c +index 23c61fc3..4a057d57 100644 +--- a/usr/iscsi_err.c ++++ b/usr/iscsi_err.c +@@ -21,6 +21,8 @@ + #include "iscsi_err.h" + #include "log.h" + ++enum iscsi_error_list iscsi_err; ++ + static char *iscsi_err_msgs[] = { + /* 0 */ "", + /* 1 */ "unknown error", +diff --git a/usr/log.c b/usr/log.c +index f29b54b3..6e16e7ce 100644 +--- a/usr/log.c ++++ b/usr/log.c +@@ -33,6 +33,7 @@ + + char *log_name; + int log_level = 0; ++struct logarea *la = NULL; + + static int log_stop_daemon = 0; + static void (*log_func)(int prio, void *priv, const char *fmt, va_list ap); +diff --git a/usr/log.h b/usr/log.h +index 486a08ea..c548791e 100644 +--- a/usr/log.h ++++ b/usr/log.h +@@ -64,7 +64,7 @@ struct logarea { + union semun semarg; + }; + +-struct logarea *la; ++extern struct logarea *la; + + extern int log_init(char *program_name, int size, + void (*func)(int prio, void *priv, const char *fmt, va_list ap),