From 880636dc73bcfa8d91bbeb661c09e8091dcd4aa3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 1 Jul 2020 14:59:28 -0700 Subject: [PATCH] owfs: fix compilation with GCC10 Upstream backport. Signed-off-by: Rosen Penev --- utils/owfs/Makefile | 2 +- utils/owfs/patches/010-gcc10.patch | 38 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 utils/owfs/patches/010-gcc10.patch diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile index 4b611d1b3a..e4f33e2145 100644 --- a/utils/owfs/Makefile +++ b/utils/owfs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owfs PKG_VERSION:=3.2p3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION) diff --git a/utils/owfs/patches/010-gcc10.patch b/utils/owfs/patches/010-gcc10.patch new file mode 100644 index 0000000000..307f3a1d52 --- /dev/null +++ b/utils/owfs/patches/010-gcc10.patch @@ -0,0 +1,38 @@ +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. +--- + 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 ) ; + -- 2.30.2