Date: Wednesday, May 27, 2020 @ 22:06:36 Author: eworm Revision: 387734
fix build with gcc 10.x Added: htop/trunk/0002-gcc10.patch Modified: htop/trunk/PKGBUILD ------------------+ 0002-gcc10.patch | 39 +++++++++++++++++++++++++++++++++++++++ PKGBUILD | 7 +++++-- 2 files changed, 44 insertions(+), 2 deletions(-) Added: 0002-gcc10.patch =================================================================== --- 0002-gcc10.patch (rev 0) +++ 0002-gcc10.patch 2020-05-27 22:06:36 UTC (rev 387734) @@ -0,0 +1,39 @@ +From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 +From: David Seifert <s...@gentoo.org> +Date: Thu, 23 Jan 2020 17:27:10 +0100 +Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default + +--- + CRT.h | 6 +++--- + linux/LinuxProcess.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CRT.h b/CRT.h +index 933fe068..65998ac6 100644 +--- a/CRT.h ++++ b/CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-27 20:57:37 UTC (rev 387733) +++ PKGBUILD 2020-05-27 22:06:36 UTC (rev 387734) @@ -17,15 +17,18 @@ options=('!emptydirs' debug) validpgpkeys=('8460980B2B79786DE0C7FCC83FD8F43C2BB3C478') # Hisham Muhammad <h...@hisham.hm> source=("https://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz"{,.asc} - '0001-fix-option-string.patch') + '0001-fix-option-string.patch' + '0002-gcc10.patch') sha256sums=('d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57' 'SKIP' - 'e0ea3a91dfbc7f8c516a19e0d8890314845e768ea4132dfaa49c4d4e89ec10ca') + 'e0ea3a91dfbc7f8c516a19e0d8890314845e768ea4132dfaa49c4d4e89ec10ca' + 'f715a87cffc6375eb3915530f4b27455b00b9324b8ee9168c0b983ba2a536938') prepare() { cd "$pkgname-$pkgver" patch -Np1 < "${srcdir}"/0001-fix-option-string.patch + patch -Np1 < "${srcdir}"/0002-gcc10.patch } build() {