Github messages for voidlinux
 help / color / mirror / Atom feed
From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
Date: Tue, 07 Mar 2023 19:09:35 +0100	[thread overview]
Message-ID: <20230307180935.R6oo8YwQldrwFsfQ2ZxiB7YFKJbCgTwgddMc3yWafAw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42644@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages chron
https://github.com/void-linux/void-packages/pull/42644

chronograf: update to 1.10.0, makedepends on nodejs, python3
- I tested the changes in this PR: only with `XBPS_CHECK=yes`
- I built this PR locally for my native architecture, (`x86_64-musl`)

drop `nodejs-lts`, add `python3`, follow upstream's guideline to build

cc mantainer @the-maldridge 

A patch file from https://github.com/void-linux/void-packages/pull/42644.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chron-42644.patch --]
[-- Type: text/x-diff, Size: 3004 bytes --]

From b09e05dea2e391631ac75f0afa19836d60e1ddd3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 7 Mar 2023 11:46:16 -0500
Subject: [PATCH 1/2] chronograf: update to 1.10.0, makedepends on nodejs,
 python3

---
 srcpkgs/chronograf/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..a61b05f9ca78 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,18 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"
 go_ldflags="-X main.version=${version}"
-hostmakedepends="dep go-bindata nodejs-lts yarn"
+hostmakedepends="dep go-bindata nodejs yarn python3"
 short_desc="Open source monitoring and visualization UI for the TICK stack"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +23,13 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="ftbfs in some js module" ;;
 esac
 
-pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
+do_build() {
+	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
+}
 
-	cd $wrksrc
-	make assets
+do_install() {
+	go install "${go_package}"
 }
 
 post_install() {

From 95d04ae5cbf6cabb1d11c707ffe59dec64283158 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 7 Mar 2023 13:07:01 -0500
Subject: [PATCH 2/2] chronograf: more broken archs

---
 srcpkgs/chronograf/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index a61b05f9ca78..fba5e3284e7f 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -21,6 +21,8 @@ make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
 	ppc*) broken="ftbfs in some js module" ;;
+	aarch64-musl) broken="aarch64-linux-musl-g++: error: unrecognized command-line option '-m64'" ;;
+	armv6l-musl) broken="arm-linux-musleabihf-g++: error: unrecognized command-line option '-m64'" ;;
 esac
 
 do_build() {
@@ -29,7 +31,7 @@ do_build() {
 }
 
 do_install() {
-	go install "${go_package}"
+	go install -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_package}"
 }
 
 post_install() {

  parent reply	other threads:[~2023-03-07 18:09 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07 16:49 [PR PATCH] " dkwo
2023-03-07 16:49 ` dkwo
2023-03-07 17:51 ` dkwo
2023-03-07 18:07 ` [PR PATCH] [Updated] " dkwo
2023-03-07 18:09 ` dkwo [this message]
2023-03-08 18:11 ` [PR REVIEW] " paper42
2023-03-08 21:23 ` dkwo
2023-03-08 21:24 ` dkwo
2023-03-09 18:57 ` paper42
2023-03-09 18:59 ` paper42
2023-03-09 18:59 ` paper42
2023-03-09 20:37 ` dkwo
2023-03-09 20:37 ` dkwo
2023-03-09 20:38 ` [PR PATCH] [Updated] " dkwo
2023-03-09 20:47 ` dkwo
2023-03-09 21:15 ` dkwo
2023-03-09 21:33 ` dkwo
2023-03-10 16:36 ` dkwo
2023-03-10 20:17 ` [PR PATCH] [Updated] " dkwo
2023-03-14 23:00 ` dkwo
2023-03-14 23:06 ` dkwo
2023-03-15 18:13 ` [PR PATCH] [Updated] " dkwo
2023-03-15 18:24 ` dkwo
2023-03-15 18:26 ` dkwo
2023-03-15 21:43 ` dkwo
2023-03-15 21:48 ` dkwo
2023-03-16 22:46 ` [PR PATCH] [Updated] " dkwo
2023-04-17 20:04 ` dkwo
2023-04-24 15:46 ` dkwo
2023-04-24 15:48 ` dkwo
2023-04-24 18:14 ` [PR PATCH] [Updated] " dkwo
2023-04-24 21:10 ` dkwo
2023-04-26 14:12 ` dkwo
2023-04-26 15:33 ` dkwo
2023-05-10 14:47 ` dkwo
2023-05-11 14:35 ` [PR PATCH] [Updated] " dkwo
2023-05-11 14:41 ` dkwo
2023-05-11 14:58 ` [PR PATCH] [Updated] " dkwo
2023-06-02 19:02 ` [PR PATCH] [Merged]: " paper42
2023-06-02 19:02 ` paper42

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=20230307180935.R6oo8YwQldrwFsfQ2ZxiB7YFKJbCgTwgddMc3yWafAw@z \
    --to=dkwo@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).