xref: /OK3568_Linux_fs/buildroot/package/read-edid/0003-fix-build-with-gcc-10.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1fix build with gcc 10
2
3Define quiet as static to avoid the following build failure with gcc 10
4(which defaults to -fno-common):
5
6/home/naourr/work/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: CMakeFiles/get-edid.dir/i2c.c.o:(.bss+0x0): multiple definition of `quiet'; CMakeFiles/get-edid.dir/get-edid.c.o:(.bss+0x0): first defined here
7
8Fixes:
9 - http://autobuild.buildroot.org/results/28bde8049b6610273bceae26eca407c819a37dcd
10
11Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
12[Upstream status: sent to pyrophobicman@gmail.com]
13
14diff -Nura read-edid-3.0.2.orig/get-edid/classic.c read-edid-3.0.2/get-edid/classic.c
15--- read-edid-3.0.2.orig/get-edid/classic.c	2020-09-25 23:25:01.928805414 +0200
16+++ read-edid-3.0.2/get-edid/classic.c	2020-09-25 23:26:37.440807301 +0200
17@@ -26,7 +26,7 @@
18 #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length)
19
20 #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
21-int quiet;
22+static int quiet;
23
24 real_ptr far_ptr_to_real_ptr( uint32 farptr )
25 {
26diff -Nura read-edid-3.0.2.orig/get-edid/get-edid.c read-edid-3.0.2/get-edid/get-edid.c
27--- read-edid-3.0.2.orig/get-edid/get-edid.c	2020-09-25 23:25:01.928805414 +0200
28+++ read-edid-3.0.2/get-edid/get-edid.c	2020-09-25 23:28:20.740809341 +0200
29@@ -9,7 +9,7 @@
30 #include <stdlib.h>
31 #include <string.h>
32
33-int quiet=0;
34+static int quiet=0;
35 int i2conly=0; //0=both, 1=i2conly, 2=classiconly
36 int i2cbus=-1;
37 int classmon=0;
38diff -Nura read-edid-3.0.2.orig/get-edid/i2c.c read-edid-3.0.2/get-edid/i2c.c
39--- read-edid-3.0.2.orig/get-edid/i2c.c	2020-09-25 23:25:01.928805414 +0200
40+++ read-edid-3.0.2/get-edid/i2c.c	2020-09-25 23:28:32.152809567 +0200
41@@ -15,7 +15,7 @@
42
43 //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys.
44
45-int quiet;
46+static int quiet;
47
48 #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); }
49
50