Date: Wed, 26 Aug 2020 09:36:18 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546256 - head/sysutils/read-edid/files Message-ID: <202008260936.07Q9aI52003860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Aug 26 09:36:18 2020 New Revision: 546256 URL: https://svnweb.freebsd.org/changeset/ports/546256 Log: Unbreak the build with -fno-common (Clang 11, GCC 10). Reported by: pkg-fallout Modified: head/sysutils/read-edid/files/patch-get-edid_classic.c head/sysutils/read-edid/files/patch-get-edid_i2c.c Modified: head/sysutils/read-edid/files/patch-get-edid_classic.c ============================================================================== --- head/sysutils/read-edid/files/patch-get-edid_classic.c Wed Aug 26 09:23:01 2020 (r546255) +++ head/sysutils/read-edid/files/patch-get-edid_classic.c Wed Aug 26 09:36:18 2020 (r546256) @@ -14,6 +14,15 @@ #include <unistd.h> #include <libx86.h> +@@ -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 ) + { @@ -135,8 +135,17 @@ classicmain( unsigned contr, int qit ) return 10; } Modified: head/sysutils/read-edid/files/patch-get-edid_i2c.c ============================================================================== --- head/sysutils/read-edid/files/patch-get-edid_i2c.c Wed Aug 26 09:23:01 2020 (r546255) +++ head/sysutils/read-edid/files/patch-get-edid_i2c.c Wed Aug 26 09:36:18 2020 (r546256) @@ -1,5 +1,14 @@ --- get-edid/i2c.c.orig 2014-11-21 11:52:13 UTC +++ 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__); } + @@ -24,7 +24,13 @@ int open_i2c_dev(int i2cbus) { char filename[16]; unsigned long funcs;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008260936.07Q9aI52003860>