From 29de5fbc5e0f61033f9a4f145b3494edc7d3c58c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Aug 2020 08:32:22 -0700 Subject: owfs: Fix build with -fno-common Signed-off-by: Khem Raj --- .../owfs/0001-Fix-compilation-with-GCC10.patch | 44 ++++++++++++++++++++++ .../recipes-filesystems/owfs/owfs_3.2p3.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch (limited to 'meta-filesystems') diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch new file mode 100644 index 0000000000..6426ecb247 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch @@ -0,0 +1,44 @@ +From a812202d22a2861318b8e39f1cd74cd222f8e76f 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. + +Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62] +Signed-off-by: Khem Raj +--- + 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.28.0 + diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index 414084449f..7f56c88fcc 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -12,6 +12,7 @@ DEPENDS = "fuse virtual/libusb0" SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" SRC_URI = "git://github.com/owfs/owfs \ file://0001-Add-build-rule-for-README.patch \ + file://0001-Fix-compilation-with-GCC10.patch \ file://owhttpd \ file://owserver \ " -- cgit 1.2.3-korg