summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 11:09:02 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-05-24 11:28:08 +0200
commit6f063b7eca51f1f3c9fb19e2207e3797f3f1bd5d (patch)
treed461536448654c9ef290fbe87f9c07f592d32d68
parentbd5388bfece79ae69c65e6e2486ae5c634914932 (diff)
downloadptxdist-6f063b7eca51f1f3c9fb19e2207e3797f3f1bd5d.tar.gz
host-unfs3: fix building with gcc 10
And order the patches a bit. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/unfs3-0.9.22/0001-fix-unfs3-build-with-recent-versions-of-flex.patch (renamed from patches/unfs3-0.9.22/0002-fix-unfs3-build-with-recent-versions-of-flex.patch)0
-rw-r--r--patches/unfs3-0.9.22/0002-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch (renamed from patches/unfs3-0.9.22/0003-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch)0
-rw-r--r--patches/unfs3-0.9.22/0003-use-libtirpc-if-found.patch (renamed from patches/unfs3-0.9.22/0004-use-libtirpc-if-found.patch)0
-rw-r--r--patches/unfs3-0.9.22/0004-attr-handle-symlinks-correctly.patch (renamed from patches/unfs3-0.9.22/0005-attr-handle-symlinks-correctly.patch)0
-rw-r--r--patches/unfs3-0.9.22/0005-fix-building-with-gcc-10.patch40
-rw-r--r--patches/unfs3-0.9.22/0100-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch (renamed from patches/unfs3-0.9.22/0001-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch)0
-rw-r--r--patches/unfs3-0.9.22/0100-initial-virtfs-support.patch (renamed from patches/unfs3-0.9.22/0006-initial-virtfs-support.patch)0
-rw-r--r--patches/unfs3-0.9.22/series17
8 files changed, 50 insertions, 7 deletions
diff --git a/patches/unfs3-0.9.22/0002-fix-unfs3-build-with-recent-versions-of-flex.patch b/patches/unfs3-0.9.22/0001-fix-unfs3-build-with-recent-versions-of-flex.patch
index 25512fc..25512fc 100644
--- a/patches/unfs3-0.9.22/0002-fix-unfs3-build-with-recent-versions-of-flex.patch
+++ b/patches/unfs3-0.9.22/0001-fix-unfs3-build-with-recent-versions-of-flex.patch
diff --git a/patches/unfs3-0.9.22/0003-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch b/patches/unfs3-0.9.22/0002-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch
index 0676d93..0676d93 100644
--- a/patches/unfs3-0.9.22/0003-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch
+++ b/patches/unfs3-0.9.22/0002-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch
diff --git a/patches/unfs3-0.9.22/0004-use-libtirpc-if-found.patch b/patches/unfs3-0.9.22/0003-use-libtirpc-if-found.patch
index 1739036..1739036 100644
--- a/patches/unfs3-0.9.22/0004-use-libtirpc-if-found.patch
+++ b/patches/unfs3-0.9.22/0003-use-libtirpc-if-found.patch
diff --git a/patches/unfs3-0.9.22/0005-attr-handle-symlinks-correctly.patch b/patches/unfs3-0.9.22/0004-attr-handle-symlinks-correctly.patch
index 31428de..31428de 100644
--- a/patches/unfs3-0.9.22/0005-attr-handle-symlinks-correctly.patch
+++ b/patches/unfs3-0.9.22/0004-attr-handle-symlinks-correctly.patch
diff --git a/patches/unfs3-0.9.22/0005-fix-building-with-gcc-10.patch b/patches/unfs3-0.9.22/0005-fix-building-with-gcc-10.patch
new file mode 100644
index 0000000..3b97cd2
--- /dev/null
+++ b/patches/unfs3-0.9.22/0005-fix-building-with-gcc-10.patch
@@ -0,0 +1,40 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 24 May 2020 11:04:30 +0200
+Subject: [PATCH] fix building with gcc 10
+
+Without this, building with gcc-10 fails with:
+
+/usr/bin/ld: Config/lib.a(y.tab.o):.../Config/exports.h:25: multiple definition of `export_path'; attr.o:.../Config/exports.h:25: first defined here
+/usr/bin/ld: Config/lib.a(lex.yy.o):.../Config/exports.l:17: multiple definition of `yylval'; Config/lib.a(y.tab.o):.../Config/y.tab.c:1507: first defined here
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Config/exports.h | 2 +-
+ Config/exports.l | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Config/exports.h b/Config/exports.h
+index 2c5edec5b58c..98acb8695fbb 100644
+--- a/Config/exports.h
++++ b/Config/exports.h
+@@ -22,7 +22,7 @@
+ extern exports exports_nfslist;
+ /* Options cache */
+ extern int exports_opts;
+-const char *export_path;
++extern const char *export_path;
+ extern uint32 export_fsid;
+ extern uint32 export_password_hash;
+
+diff --git a/Config/exports.l b/Config/exports.l
+index 8aa2011932a6..ffccd85627ee 100644
+--- a/Config/exports.l
++++ b/Config/exports.l
+@@ -14,7 +14,6 @@
+
+ #define YY_NO_UNPUT
+
+-YYSTYPE yylval;
+ extern int e_error;
+
+ /*
diff --git a/patches/unfs3-0.9.22/0001-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch b/patches/unfs3-0.9.22/0100-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch
index 846bcae..846bcae 100644
--- a/patches/unfs3-0.9.22/0001-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch
+++ b/patches/unfs3-0.9.22/0100-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch
diff --git a/patches/unfs3-0.9.22/0006-initial-virtfs-support.patch b/patches/unfs3-0.9.22/0100-initial-virtfs-support.patch
index e04160d..e04160d 100644
--- a/patches/unfs3-0.9.22/0006-initial-virtfs-support.patch
+++ b/patches/unfs3-0.9.22/0100-initial-virtfs-support.patch
diff --git a/patches/unfs3-0.9.22/series b/patches/unfs3-0.9.22/series
index 76b9cb8..6c61987 100644
--- a/patches/unfs3-0.9.22/series
+++ b/patches/unfs3-0.9.22/series
@@ -1,9 +1,12 @@
# generated by git-ptx-patches
#tag:base --start-number 1
-0001-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch
-0002-fix-unfs3-build-with-recent-versions-of-flex.patch
-0003-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch
-0004-use-libtirpc-if-found.patch
-0005-attr-handle-symlinks-correctly.patch
-0006-initial-virtfs-support.patch
-# a8ac7f2ac55ce5a54417780b74564a66 - git-ptx-patches magic
+0001-fix-unfs3-build-with-recent-versions-of-flex.patch
+0002-64-bit-fixes-don-t-assume-that-long-is-the-same-size.patch
+0003-use-libtirpc-if-found.patch
+0004-attr-handle-symlinks-correctly.patch
+0005-fix-building-with-gcc-10.patch
+#tag:ptxdist --start-number 100
+0100-HACK-use-the-environment-variable-UNFS_BASE-as-root-.patch
+#tag:virtfs --start-number 100
+0100-initial-virtfs-support.patch
+# 1e03b4d522674424e2f826ce540bc797 - git-ptx-patches magic