Browse Source

Merge pull request #13446 from neheb/owfsd

owfs: update to 3.2p4
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
5052adfa15
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 41 deletions
  1. +3
    -3
      utils/owfs/Makefile
  2. +0
    -38
      utils/owfs/patches/010-gcc10.patch

+ 3
- 3
utils/owfs/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=owfs
PKG_VERSION:=3.2p3
PKG_RELEASE:=3
PKG_VERSION:=3.2p4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION)
PKG_HASH:=b8d33eba57d4a2f6c8a11ff23f233e3248bd75a42c8219b058a888846edd8717
PKG_HASH:=af0a5035f3f3df876ca15aea13486bfed6b3ef5409dee016db0be67755c35fcc
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=GPL-2.0


+ 0
- 38
utils/owfs/patches/010-gcc10.patch View File

@ -1,38 +0,0 @@
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 ) ;

Loading…
Cancel
Save