From: daniel-eys <daniel-eys@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] nmon: Don't hardcode X86 platform
Date: Mon, 07 Sep 2020 21:59:24 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24741@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
There is a new pull request by daniel-eys against master on the void-packages repository
https://github.com/daniel-eys/void-packages nmon
https://github.com/void-linux/void-packages/pull/24741
nmon: Don't hardcode X86 platform
Also remove JFS GETUSER LARGEMEM which have been removed upstream.
A patch file from https://github.com/void-linux/void-packages/pull/24741.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nmon-24741.patch --]
[-- Type: text/x-diff, Size: 1151 bytes --]
From fa366d1192c65a2873bee28b1d7cf772dd9de79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 7 Sep 2020 20:28:16 +0200
Subject: [PATCH] nmon: Don't hardcode X86 platform
Also remove JFS GETUSER LARGEMEM which have been removed upstream.
---
srcpkgs/nmon/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nmon/template b/srcpkgs/nmon/template
index 7651f9402a3..76f09917ade 100644
--- a/srcpkgs/nmon/template
+++ b/srcpkgs/nmon/template
@@ -1,7 +1,7 @@
# Template file for 'nmon'
pkgname=nmon
version=16m
-revision=1
+revision=2
build_style=fetch
makedepends="ncurses-devel"
depends="ncurses"
@@ -13,7 +13,12 @@ distfiles="${SOURCEFORGE_SITE}/nmon/files/lmon${version}.c"
checksum=2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1
do_build() {
- $CC ${CFLAGS} ${LDFLAGS} -D JFS -D GETUSER -D LARGEMEM -D X86 \
+ case "$XBPS_TARGET_MACHINE" in
+ ppc*) _ARCH="POWER" ;;
+ arm*|aarch64*) _ARCH="ARM" ;;
+ i686*|x86_64*) _ARCH="X86" ;;
+ esac
+ $CC ${CFLAGS} ${LDFLAGS} -D $_ARCH \
lmon${version}.c -lncurses -lm -o nmon
}
next reply other threads:[~2020-09-07 19:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 19:59 daniel-eys [this message]
2020-09-23 9:35 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24741@inbox.vuxu.org \
--to=daniel-eys@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).