helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 16:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

htop: Fix build with -fno-common

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2020-08-11 23:42:58 -07:00
parent f751dcf81a
commit d9f0278666
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta-oe/recipes-support/htop/files/htop-gcc10.patch Normal file
View File

@ -0,0 +1,31 @@
Fix build with -fno-common
Upstream-Staus: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- 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

1
meta-oe/recipes-support/htop/htop_2.2.0.bb
View File

@ -9,6 +9,7 @@ DEPENDS = "ncurses"
SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \
file://0001-Use-pkg-config.patch \ file://0001-Use-pkg-config.patch \
file://0001-Ask-for-python3-specifically.patch \ file://0001-Ask-for-python3-specifically.patch \
file://htop-gcc10.patch \
" "
SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8"
SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57"