From: Felix Mellmann <flix.ptxdist@benfm.de>
To: ptxdist@pengutronix.de
Cc: Felix Mellmann <flix.ptxdist@benfm.de>
Subject: [ptxdist] [PATCH 2/2] ifplugd: Added new patch to fix a linker error with GCC10
Date: Mon, 31 May 2021 15:29:47 +0200 [thread overview]
Message-ID: <20210531132947.220277-2-flix.ptxdist@benfm.de> (raw)
In-Reply-To: <20210531132947.220277-1-flix.ptxdist@benfm.de>
Added a new patch to the ifplugd package which resolves a
linker error when using GCC10.
Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
---
...02-Fix-linker-error-when-using-GCC10.patch | 28 +++++++++++++++++++
patches/ifplugd-0.28/series | 3 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
diff --git a/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
new file mode 100644
index 000000000..b1800d7c6
--- /dev/null
+++ b/patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch
@@ -0,0 +1,28 @@
+From: Felix Mellmann <flix.ptxdist@benfm.de>
+Date: Mon, 31 May 2021 15:05:14 +0200
+Subject: [PATCH] Fix linker error when using GCC10
+
+This patch fixes a linker error when using GCC10. Two
+variables need to be marked as external to avoid multiple
+definition.
+
+Signed-off-by: Felix Mellmann <flix.ptxdist@benfm.de>
+---
+ src/interface.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/interface.h b/src/interface.h
+index d223b1f5fabc..fd4a5f4cea63 100644
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -21,8 +21,8 @@
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+-int interface_auto_up;
+-int interface_do_message;
++extern int interface_auto_up;
++extern int interface_do_message;
+
+ typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
+
diff --git a/patches/ifplugd-0.28/series b/patches/ifplugd-0.28/series
index a564ff7dd..1f8bb67d0 100644
--- a/patches/ifplugd-0.28/series
+++ b/patches/ifplugd-0.28/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-Compilation-fails-because-of-kernel-header-inclusion.patch
-# bbf895f48ef5cf6b103f60be48b437c9 - git-ptx-patches magic
+0002-Fix-linker-error-when-using-GCC10.patch
+# 5f6a3e3cf4117f7c3e207f9b9c45eb10 - git-ptx-patches magic
--
2.25.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-05-31 13:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 13:29 [ptxdist] [PATCH 1/2] ifplugd: Updated current patch set using git ptx-patches Felix Mellmann
2021-05-31 13:29 ` Felix Mellmann [this message]
2021-06-16 10:35 ` [ptxdist] [APPLIED] ifplugd: Added new patch to fix a linker error with GCC10 Michael Olbrich
2021-06-16 10:35 ` [ptxdist] [APPLIED] ifplugd: Updated current patch set using git ptx-patches Michael Olbrich
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=20210531132947.220277-2-flix.ptxdist@benfm.de \
--to=flix.ptxdist@benfm.de \
--cc=ptxdist@pengutronix.de \
/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