From 8d57f13b7a9de24b507e16e6f3ad61920fff6501 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 Aug 2020 12:18:35 +0200 Subject: [PATCH] package/owfs: fix build with gcc 10 Fixes: - http://autobuild.buildroot.org/results/7e9c33d7a1613826f85716403a00dce03dd8daf2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-Fix-compilation-with-GCC10.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/owfs/0001-Fix-compilation-with-GCC10.patch diff --git a/package/owfs/0001-Fix-compilation-with-GCC10.patch b/package/owfs/0001-Fix-compilation-with-GCC10.patch new file mode 100644 index 0000000000..49b703ee28 --- /dev/null +++ b/package/owfs/0001-Fix-compilation-with-GCC10.patch @@ -0,0 +1,41 @@ +From 43a4bc6b750c37f585d03b14941f3633ed5348d8 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Tue, 9 Jun 2020 11:30:38 +0300 +Subject: [PATCH] Fix compilation with GCC10 + +Fixed compilation with -fno-common, which enabled in GCC 10 by default. +See https://bugs.gentoo.org/707438. +[Retrieved from: +https://github.com/owfs/owfs/commit/43a4bc6b750c37f585d03b14941f3633ed5348d8] +Signed-off-by: Fabrice Fontaine +--- + module/owserver/src/c/owserver.c | 2 ++ + module/owserver/src/include/owserver.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c +index db29988e..2ed29161 100644 +--- a/module/owserver/src/c/owserver.c ++++ b/module/owserver/src/c/owserver.c +@@ -36,6 +36,8 @@ + + #include "owserver.h" + ++pthread_mutex_t persistence_mutex ; ++ + /* --- Prototypes ------------ */ + static void SetupAntiloop(int argc, char **argv); + +diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h +index 8be582f0..a257ed02 100644 +--- a/module/owserver/src/include/owserver.h ++++ b/module/owserver/src/include/owserver.h +@@ -18,7 +18,7 @@ + #include "ow.h" + #include "ow_connection.h" + +-pthread_mutex_t persistence_mutex ; ++extern pthread_mutex_t persistence_mutex ; + #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; + #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; +