summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Mellmann <flix.ptxdist@benfm.de>2021-05-31 15:29:47 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-06-04 11:27:04 +0200
commit1e5fab0e2e79dd79d16385abcd3c9e6ec22a7917 (patch)
tree7e298768ffc8988782e50e8e5fdc14ff0a8c6db1
parentb82b12975306f5f7da93dfee8290ff40791947e2 (diff)
downloadptxdist-1e5fab0e2e79dd79d16385abcd3c9e6ec22a7917.tar.gz
ptxdist-1e5fab0e2e79dd79d16385abcd3c9e6ec22a7917.tar.xz
ifplugd: Added new patch to fix a linker error with GCC10
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> Message-Id: <20210531132947.220277-2-flix.ptxdist@benfm.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/ifplugd-0.28/0002-Fix-linker-error-when-using-GCC10.patch28
-rw-r--r--patches/ifplugd-0.28/series3
2 files changed, 30 insertions, 1 deletions
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