* [meta-oe][PATCH 1/3] memtester: Fix build with -fno-common
@ 2020-08-13 18:12 Khem Raj
2020-08-13 18:12 ` [meta-oe][PATCH 2/3] read-edid: Fix build with gcc-10+ Khem Raj
2020-08-13 18:12 ` [meta-filesystems][PATCH 3/3] owfs: Fix build with -fno-common Khem Raj
0 siblings, 2 replies; 3+ messages in thread
From: Khem Raj @ 2020-08-13 18:12 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-Define-mword16-and-mword8-once.patch | 57 +++++++++++++++++++
.../memtester/memtester_4.3.0.bb | 7 ++-
2 files changed, 61 insertions(+), 3 deletions(-)
create mode 100644 meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch
diff --git a/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch b/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch
new file mode 100644
index 0000000000..ffd9b9f266
--- /dev/null
+++ b/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch
@@ -0,0 +1,57 @@
+From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Aug 2020 23:18:30 -0700
+Subject: [PATCH] Define mword16 and mword8 once
+
+Defining them in .h meant they are defined in all .c files including
+this .h file
+
+Fixes build with gcc 10+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests.c | 9 +++++++++
+ types.h | 9 ---------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests.c b/tests.c
+index be1b350..4305bed 100644
+--- a/tests.c
++++ b/tests.c
+@@ -27,6 +27,15 @@ char progress[] = "-\\|/";
+ #define PROGRESSOFTEN 2500
+ #define ONE 0x00000001L
+
++union {
++ unsigned char bytes[UL_LEN/8];
++ ul val;
++} mword8;
++
++union {
++ unsigned short u16s[UL_LEN/16];
++ ul val;
++} mword16;
+ /* Function definitions. */
+
+ int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
+diff --git a/types.h b/types.h
+index ad7ce73..e14ea32 100644
+--- a/types.h
++++ b/types.h
+@@ -25,12 +25,3 @@ struct test {
+ int (*fp)();
+ };
+
+-union {
+- unsigned char bytes[UL_LEN/8];
+- ul val;
+-} mword8;
+-
+-union {
+- unsigned short u16s[UL_LEN/16];
+- ul val;
+-} mword16;
+--
+2.28.0
+
diff --git a/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
index 0964c04874..3d29055781 100644
--- a/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
+++ b/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
@@ -5,9 +5,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz"
-SRC_URI += "file://Makefile.patch"
-
+SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
+ file://Makefile.patch \
+ file://0001-Define-mword16-and-mword8-once.patch \
+ "
SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe"
SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-oe][PATCH 2/3] read-edid: Fix build with gcc-10+
2020-08-13 18:12 [meta-oe][PATCH 1/3] memtester: Fix build with -fno-common Khem Raj
@ 2020-08-13 18:12 ` Khem Raj
2020-08-13 18:12 ` [meta-filesystems][PATCH 3/3] owfs: Fix build with -fno-common Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2020-08-13 18:12 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-get-edid-define-quiet-once.patch | 44 +++++++++++++++++++
.../read-edid/read-edid_3.0.2.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch
diff --git a/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch
new file mode 100644
index 0000000000..5147f17c3a
--- /dev/null
+++ b/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch
@@ -0,0 +1,44 @@
+From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Aug 2020 23:39:32 -0700
+Subject: [PATCH] get-edid: define quiet once
+
+Fixes build with gcc 10
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ get-edid/classic.c | 2 +-
+ get-edid/i2c.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/get-edid/classic.c b/get-edid/classic.c
+index 9cc8ee3..b13f5f0 100644
+--- a/get-edid/classic.c
++++ b/get-edid/classic.c
+@@ -26,7 +26,7 @@ typedef byte* real_ptr;
+ #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length)
+
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+-int quiet;
++extern int quiet;
+
+ real_ptr far_ptr_to_real_ptr( uint32 farptr )
+ {
+diff --git a/get-edid/i2c.c b/get-edid/i2c.c
+index 625d7cb..0929e98 100644
+--- a/get-edid/i2c.c
++++ b/get-edid/i2c.c
+@@ -15,7 +15,7 @@
+
+ //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys.
+
+-int quiet;
++extern int quiet;
+
+ #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
+
+--
+2.28.0
+
diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
index e4c2cadc2d..1aa492c31b 100644
--- a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
+++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26"
SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \
file://0001-Do-not-install-license-file.patch \
+ file://0001-get-edid-define-quiet-once.patch \
"
SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854"
SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-filesystems][PATCH 3/3] owfs: Fix build with -fno-common
2020-08-13 18:12 [meta-oe][PATCH 1/3] memtester: Fix build with -fno-common Khem Raj
2020-08-13 18:12 ` [meta-oe][PATCH 2/3] read-edid: Fix build with gcc-10+ Khem Raj
@ 2020-08-13 18:12 ` Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2020-08-13 18:12 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../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
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" <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.
+
+Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ 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 \
"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-13 18:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-13 18:12 [meta-oe][PATCH 1/3] memtester: Fix build with -fno-common Khem Raj
2020-08-13 18:12 ` [meta-oe][PATCH 2/3] read-edid: Fix build with gcc-10+ Khem Raj
2020-08-13 18:12 ` [meta-filesystems][PATCH 3/3] owfs: Fix build with -fno-common Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.