helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

nmon: Upgrade to 16g

Browse Source 
Fix build with musl while here.
link with libm for ceilf API

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-07-14 18:55:36 -07:00 committed by Martin Jansa
parent 222db35a89
commit 92d9eabbf6
2 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch Normal file
View File

@ -0,0 +1,46 @@
From d977b5170027926eb97ab9742ddc51d2a5555a34 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 14 Jul 2017 10:06:49 -0700
Subject: [PATCH] lmon16g.c: Adjust system headers
fstab.h is unused
errno.h is in /usr/include
defines from sys/cdefs.h is used
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lmon16g.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lmon16g.c b/lmon16g.c
index cb27e09..d2a11c5 100644
--- a/lmon16g.c
+++ b/lmon16g.c
@@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION;
#include <fcntl.h>
#include <math.h>
#include <time.h>
-#include <sys/errno.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -71,6 +71,7 @@ static char *SccsId = "nmon " VERSION;
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/wait.h>
+#include <sys/cdefs.h>
/* Windows moved here so they can be cleared when the screen mode changes */
WINDOW *padwelcome = NULL;
@@ -576,7 +577,6 @@ struct procsinfo {
int isroot = 0;
#include <mntent.h>
-#include <fstab.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <net/if.h>
--
2.13.3

16
meta-oe/recipes-support/nmon/nmon_13g.bb → meta-oe/recipes-support/nmon/nmon_16g.bb
View File

@ -4,23 +4,25 @@ SECTION = "console/utils"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a"
DEPENDS = "ncurses"
PR = "r2"
DEPENDS_append_libc-musl = " bsd-headers"
SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon13g.c;name=lmon \
SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \
${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \
file://0001-lmon16g.c-Adjust-system-headers.patch \
"
SRC_URI[lmon.md5sum] = "b1b8e6c0123ad232394991f2d4f40494"
SRC_URI[lmon.sha256sum] = "456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5"
SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72"
SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688"
SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a"
SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278"
CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM"
LDFLAGS += "-ltinfo -lncursesw"
LDFLAGS += "-ltinfo -lncursesw -lm"
ASNEEDED_pn-nmon = ""
S = "${WORKDIR}"
do_compile() {
${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon
${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon
}
do_install() {