Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

owfs: fix compilation with GCC10

Browse source 
Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-07-01 14:59:28 -07:00
parent 961016a84f
commit 880636dc73
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/owfs/Makefile
View file

@ -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)

38
utils/owfs/patches/010-gcc10.patch Normal file
View file

@ -0,0 +1,38 @@
From 43a4bc6b750c37f585d03b14941f3633ed5348d8 Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
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 ) ;