Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3
@ 2023-03-07 16:49 dkwo
  2023-03-07 16:49 ` dkwo
                   ` (38 more replies)
  0 siblings, 39 replies; 40+ messages in thread
From: dkwo @ 2023-03-07 16:49 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1902 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] 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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
@ 2023-03-07 16:49 ` dkwo
  2023-03-07 17:51 ` dkwo
                   ` (37 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-07 16:49 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1458500603

Comment:
#40106 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
  2023-03-07 16:49 ` dkwo
@ 2023-03-07 17:51 ` dkwo
  2023-03-07 18:07 ` [PR PATCH] [Updated] " dkwo
                   ` (36 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-07 17:51 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1458588502

Comment:
hitting some crosscompile issue at `aarch64-linux-musl-g++: error: unrecognized command-line option '-m64'`

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
  2023-03-07 16:49 ` dkwo
  2023-03-07 17:51 ` dkwo
@ 2023-03-07 18:07 ` dkwo
  2023-03-07 18:09 ` dkwo
                   ` (35 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-07 18:07 UTC (permalink / raw)
  To: ml

[-- 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: 3029 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 9b5c3f41b99216f11b3af6f468dda19c7299a662 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index a61b05f9ca78..629eadf21fa2 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,8 @@ do_build() {
 }
 
 do_install() {
-	go install "${go_package}"
+#	go install "${go_package}"
+	go install -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_package}"
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (2 preceding siblings ...)
  2023-03-07 18:07 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-07 18:09 ` dkwo
  2023-03-08 18:11 ` [PR REVIEW] " paper42
                   ` (34 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-07 18:09 UTC (permalink / raw)
  To: ml

[-- 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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (3 preceding siblings ...)
  2023-03-07 18:09 ` dkwo
@ 2023-03-08 18:11 ` paper42
  2023-03-08 21:23 ` dkwo
                   ` (33 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-03-08 18:11 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1129849986

Comment:
it's not really a good idea to suddenly remove a package from some repositories, this would require manual intervention into the repositories and people with chronograf on these architectures wouldn't be able to update. Can we just patch it out?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (4 preceding siblings ...)
  2023-03-08 18:11 ` [PR REVIEW] " paper42
@ 2023-03-08 21:23 ` dkwo
  2023-03-08 21:24 ` dkwo
                   ` (32 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-08 21:23 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1130037549

Comment:
it seems that node-gyp is leaking some of the host flags when cross compiling to musl, but I have no idea where those are set or how can be patched (I do not see anything in the makefile).

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (5 preceding siblings ...)
  2023-03-08 21:23 ` dkwo
@ 2023-03-08 21:24 ` dkwo
  2023-03-09 18:57 ` paper42
                   ` (31 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-08 21:24 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1130037978

Comment:
is setting nocross for musl archs an option?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (6 preceding siblings ...)
  2023-03-08 21:24 ` dkwo
@ 2023-03-09 18:57 ` paper42
  2023-03-09 18:59 ` paper42
                   ` (30 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-03-09 18:57 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1131465730

Comment:
no, it has the same issue

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (7 preceding siblings ...)
  2023-03-09 18:57 ` paper42
@ 2023-03-09 18:59 ` paper42
  2023-03-09 18:59 ` paper42
                   ` (29 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-03-09 18:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1131467283

Comment:
```suggestion
homepage="https://www.influxdata.com/time-series-platform/chronograf/"
changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
```

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (8 preceding siblings ...)
  2023-03-09 18:59 ` paper42
@ 2023-03-09 18:59 ` paper42
  2023-03-09 20:37 ` dkwo
                   ` (28 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-03-09 18:59 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1131467558

Comment:
```suggestion
distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
```

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (9 preceding siblings ...)
  2023-03-09 18:59 ` paper42
@ 2023-03-09 20:37 ` dkwo
  2023-03-09 20:37 ` dkwo
                   ` (27 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 20:37 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1131565162

Comment:
done

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR REVIEW] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (10 preceding siblings ...)
  2023-03-09 20:37 ` dkwo
@ 2023-03-09 20:37 ` dkwo
  2023-03-09 20:38 ` [PR PATCH] [Updated] " dkwo
                   ` (26 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 20:37 UTC (permalink / raw)
  To: ml

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#discussion_r1131565274

Comment:
done

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (11 preceding siblings ...)
  2023-03-09 20:37 ` dkwo
@ 2023-03-09 20:38 ` dkwo
  2023-03-09 20:47 ` dkwo
                   ` (25 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 20:38 UTC (permalink / raw)
  To: ml

[-- 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: 3238 bytes --]

From b0d69812ab5f5d84df60f662a7a77910a926bc5d 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 332a90fb05466d710c1376287e5c111b2fc8bb1c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Mar 2023 15:36:40 -0500
Subject: [PATCH 2/2] chronograf: minor, try i686

---
 srcpkgs/chronograf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index a61b05f9ca78..7b49193e66c1 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -11,7 +11,8 @@ 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"
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
 checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
@@ -19,7 +20,6 @@ _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="yarn not available" ;;
 	ppc*) broken="ftbfs in some js module" ;;
 esac
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (12 preceding siblings ...)
  2023-03-09 20:38 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-09 20:47 ` dkwo
  2023-03-09 21:15 ` dkwo
                   ` (24 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 20:47 UTC (permalink / raw)
  To: ml

[-- 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: 2076 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (13 preceding siblings ...)
  2023-03-09 20:47 ` dkwo
@ 2023-03-09 21:15 ` dkwo
  2023-03-09 21:33 ` dkwo
                   ` (23 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 21:15 UTC (permalink / raw)
  To: ml

[-- 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: 2080 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..e1499457de6b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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 git"
 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (14 preceding siblings ...)
  2023-03-09 21:15 ` dkwo
@ 2023-03-09 21:33 ` dkwo
  2023-03-10 16:36 ` dkwo
                   ` (22 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-09 21:33 UTC (permalink / raw)
  To: ml

[-- 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: 2076 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (15 preceding siblings ...)
  2023-03-09 21:33 ` dkwo
@ 2023-03-10 16:36 ` dkwo
  2023-03-10 20:17 ` [PR PATCH] [Updated] " dkwo
                   ` (21 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-10 16:36 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1464068304

Comment:
node-gyp fails on aarch64 and arm because of -m64 flag not existing on their compilers
(somehow the musl cross compiler is stricter)
because build scripts pass x86_64-specific flag to all targets

@Chocimier you pointed out this in the past, do you know how to fix it?

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (16 preceding siblings ...)
  2023-03-10 16:36 ` dkwo
@ 2023-03-10 20:17 ` dkwo
  2023-03-14 23:00 ` dkwo
                   ` (20 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-10 20:17 UTC (permalink / raw)
  To: ml

[-- 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: 2815 bytes --]

From c1dfb9e4b8c76f6a7d46ff3e86faa68700b0c614 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 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 66965263348424f0ed9b5cfbd9452705dd1088d2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/2] chronograf: edit makefile by hand

---
 srcpkgs/chronograf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..e3becea446aa 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -26,6 +26,7 @@ esac
 
 do_build() {
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (17 preceding siblings ...)
  2023-03-10 20:17 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-14 23:00 ` dkwo
  2023-03-14 23:06 ` dkwo
                   ` (19 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-14 23:00 UTC (permalink / raw)
  To: ml

[-- 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: 3783 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 203326c5f9a5f1ae4334d060c6564b8fbf500579 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/3] chronograf: edit makefile by hand

---
 srcpkgs/chronograf/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..e3becea446aa 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -26,6 +26,7 @@ esac
 
 do_build() {
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

From 4e08850618f54ec528d9fd43f71d805f19b96a5e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 14 Mar 2023 19:00:36 -0400
Subject: [PATCH 3/3] chronograf: try to fix cross

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

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index e3becea446aa..f7398cd24978 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -25,6 +25,15 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_build() {
+	case "$XBPS_TARGET_MACHINE" in
+		aarch64-musl)
+			export npm_config_arch=arm64
+			export npm_target_arch=arm64
+			export npm_config_target_libc=musl
+			export npm_target_libc=musl
+		;;
+	esac
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
 	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (18 preceding siblings ...)
  2023-03-14 23:00 ` dkwo
@ 2023-03-14 23:06 ` dkwo
  2023-03-15 18:13 ` [PR PATCH] [Updated] " dkwo
                   ` (18 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-14 23:06 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1468984146

Comment:
still trying to fix cross compilation: I think I made some progress, now stuck at
```
yarn run v1.22.18
$ APP_VERSION=$npm_package_version GIT_SHA=$(git rev-parse HEAD) parcel build --log-level error
fatal: not a git repository (or any of the parent directories): .git
Error: Error relocating /builddir/chronograf-1.10.0/node_modules/@parcel/watcher/build/Release/watcher.node: unsupported relocation type 1026
    at Object.Module._extensions..node (node:internal/modules/cjs/loader:1249:18)
    at Module.load (node:internal/modules/cjs/loader:1043:32)
    at Function.Module._load (node:internal/modules/cjs/loader:878:12)
    at Module.require (node:internal/modules/cjs/loader:1067:19)
    at require (/builddir/chronograf-1.10.0/node_modules/v8-compile-cache/v8-compile-cache.js:159:20)
    at load (/builddir/chronograf-1.10.0/node_modules/node-gyp-build/index.js:22:10)
    at Object.<anonymous> (/builddir/chronograf-1.10.0/node_modules/@parcel/watcher/index.js:1:104)
    at Module._compile (/builddir/chronograf-1.10.0/node_modules/v8-compile-cache/v8-compile-cache.js:192:30)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1219:10)
    at Module.load (node:internal/modules/cjs/loader:1043:32) {
  code: 'ERR_DLOPEN_FAILED'
}
error Command failed with exit code 1.
```

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (19 preceding siblings ...)
  2023-03-14 23:06 ` dkwo
@ 2023-03-15 18:13 ` dkwo
  2023-03-15 18:24 ` dkwo
                   ` (17 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-15 18:13 UTC (permalink / raw)
  To: ml

[-- 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: 3382 bytes --]

From 2e389de90ab21d3de8816e8d94d094998780f8b5 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 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 0148296df37c6b1c6b87779ac2b633f7ba9e2821 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/2] chronograf: try to fix cross

---
 srcpkgs/chronograf/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..37ee1e8ad95f 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -20,12 +20,22 @@ _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*) broken="yarn not available" ;;
+	i686*) _target_arch=ia32 ;;
 	ppc*) broken="ftbfs in some js module" ;;
+	aarch64*) _target_arch=arm64 ;;
+	armv6l*) _target_arch=arm ;;
+	x86_64*) _target_arch=x64 ;;
+	*) _target_arch=$XBPS_TARGET_MACHINE ;;
 esac
 
 do_build() {
+	export npm_config_arch=${_target_arch}
+	# export npm_target_arch=arm64
+	# export npm_config_target_libc=musl
+	# export npm_target_libc=musl
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (20 preceding siblings ...)
  2023-03-15 18:13 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-15 18:24 ` dkwo
  2023-03-15 18:26 ` dkwo
                   ` (16 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-15 18:24 UTC (permalink / raw)
  To: ml

[-- 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: 3221 bytes --]

From 2e389de90ab21d3de8816e8d94d094998780f8b5 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 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 a039c3a57a226ccab8a2b5dcff413b91ad7d320a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/2] chronograf: try to fix cross

---
 srcpkgs/chronograf/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..5403f6e8cb4d 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -22,10 +22,18 @@ 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) _target_arch=arm64 ;;
+	armv6l-musl) _target_arch=arm ;;
 esac
 
 do_build() {
+	export npm_config_arch=${_target_arch}
+	# export npm_target_arch=arm64
+	# export npm_config_target_libc=musl
+	# export npm_target_libc=musl
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (21 preceding siblings ...)
  2023-03-15 18:24 ` dkwo
@ 2023-03-15 18:26 ` dkwo
  2023-03-15 21:43 ` dkwo
                   ` (15 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-15 18:26 UTC (permalink / raw)
  To: ml

[-- 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: 3243 bytes --]

From 2e389de90ab21d3de8816e8d94d094998780f8b5 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 | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 4b46e15b0d365299c7e024120b27d352797befa3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/2] chronograf: try to fix cross

---
 srcpkgs/chronograf/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..41405a2c374b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -22,10 +22,18 @@ 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) export npm_config_arch=arm64 ;;
+	armv6l-musl) export npm_config_arch=arm ;;
 esac
 
 do_build() {
+	# export npm_config_arch=${_target_arch}
+	# export npm_target_arch=arm64
+	# export npm_config_target_libc=musl
+	# export npm_target_libc=musl
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (22 preceding siblings ...)
  2023-03-15 18:26 ` dkwo
@ 2023-03-15 21:43 ` dkwo
  2023-03-15 21:48 ` dkwo
                   ` (14 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-15 21:43 UTC (permalink / raw)
  To: ml

[-- 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: 4960 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 c422e64f88613c45525334761aae8420b7a69990 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/3] chronograf: try to fix cross

---
 srcpkgs/chronograf/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..41405a2c374b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -22,10 +22,18 @@ 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) export npm_config_arch=arm64 ;;
+	armv6l-musl) export npm_config_arch=arm ;;
 esac
 
 do_build() {
+	# export npm_config_arch=${_target_arch}
+	# export npm_target_arch=arm64
+	# export npm_config_target_libc=musl
+	# export npm_target_libc=musl
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

From 111d7d7d826b56a681872f6c5aa94eaab458451a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Mar 2023 17:42:12 -0400
Subject: [PATCH 3/3] chronograf: nocross

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

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 41405a2c374b..e5508617261b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -14,6 +14,8 @@ homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
 distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
 checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
+nocross=yes # yarn -> node-gyp: introduces -m64, which is not in our crosstoolchain;
+# if try to use npm_config_arch=arm64, then other errors
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -22,16 +24,9 @@ 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) export npm_config_arch=arm64 ;;
-	armv6l-musl) export npm_config_arch=arm ;;
 esac
 
 do_build() {
-	# export npm_config_arch=${_target_arch}
-	# export npm_target_arch=arm64
-	# export npm_config_target_libc=musl
-	# export npm_target_libc=musl
-
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
 	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (23 preceding siblings ...)
  2023-03-15 21:43 ` dkwo
@ 2023-03-15 21:48 ` dkwo
  2023-03-16 22:46 ` [PR PATCH] [Updated] " dkwo
                   ` (13 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-15 21:48 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1470889860

Comment:
sorry, I think I'm unable to fix cross compilation (to musl in particular). yarn uses node-gyp, which passes the option `-m64` to the compiler, even though that option is not in our crosstoolchain (the cross tool chain correctly exports CC, CC_host, etc). if I try to work around that by exporting things like `npm_config_target=arm64`, then it hits other errors down the line, like the one above.

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (24 preceding siblings ...)
  2023-03-15 21:48 ` dkwo
@ 2023-03-16 22:46 ` dkwo
  2023-04-17 20:04 ` dkwo
                   ` (12 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-03-16 22:46 UTC (permalink / raw)
  To: ml

[-- 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: 4876 bytes --]

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

---
 srcpkgs/chronograf/template | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 5dfcc1c3ef7c..1ecdbeaadf4a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,18 +1,19 @@
 # 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
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -23,13 +24,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 e23476c837f0ee309d3de408888685cf8138ba78 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 10 Mar 2023 15:17:19 -0500
Subject: [PATCH 2/3] chronograf: try to fix cross

---
 srcpkgs/chronograf/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 1ecdbeaadf4a..41405a2c374b 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -22,10 +22,18 @@ 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) export npm_config_arch=arm64 ;;
+	armv6l-musl) export npm_config_arch=arm ;;
 esac
 
 do_build() {
+	# export npm_config_arch=${_target_arch}
+	# export npm_target_arch=arm64
+	# export npm_config_target_libc=musl
+	# export npm_target_libc=musl
+
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
+	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make
 }
 

From 118a832666816191f2bf19a4ae8e4394a0235404 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Mar 2023 17:42:12 -0400
Subject: [PATCH 3/3] chronograf: nocross

---
 srcpkgs/chronograf/template | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 41405a2c374b..e66e812b0088 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -14,6 +14,7 @@ homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
 distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
 checksum=4c9ec541a77314b11f23f2eff1394568ea9180f1f3cc3f098cb3e7977dbfd7a5
+nocross=yes # https://github.com/nodejs/node-gyp/issues/2817
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
@@ -22,16 +23,9 @@ 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) export npm_config_arch=arm64 ;;
-	armv6l-musl) export npm_config_arch=arm ;;
 esac
 
 do_build() {
-	# export npm_config_arch=${_target_arch}
-	# export npm_target_arch=arm64
-	# export npm_config_target_libc=musl
-	# export npm_target_libc=musl
-
 	go get -p "$XBPS_MAKEJOBS" -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" "${go_import_path}"
 	sed -i '17s/.*/LDFLAGS=-ldflags "-s -X main.version=1.10.0"/' Makefile
 	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (25 preceding siblings ...)
  2023-03-16 22:46 ` [PR PATCH] [Updated] " dkwo
@ 2023-04-17 20:04 ` dkwo
  2023-04-24 15:46 ` dkwo
                   ` (11 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-17 20:04 UTC (permalink / raw)
  To: ml

[-- 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: 2219 bytes --]

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

---
 srcpkgs/chronograf/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..c97e4b7083ce 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,19 +1,20 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
+nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
@@ -23,13 +24,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() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (26 preceding siblings ...)
  2023-04-17 20:04 ` dkwo
@ 2023-04-24 15:46 ` dkwo
  2023-04-24 15:48 ` dkwo
                   ` (10 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-24 15:46 UTC (permalink / raw)
  To: ml

[-- 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: 2093 bytes --]

From 035967887e58096153e4a0dc0e9d96f517a7c9f1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

---
 srcpkgs/chronograf/template | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..51ee5fb0f1c5 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,22 +1,23 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
@@ -24,12 +25,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (27 preceding siblings ...)
  2023-04-24 15:46 ` dkwo
@ 2023-04-24 15:48 ` dkwo
  2023-04-24 18:14 ` [PR PATCH] [Updated] " dkwo
                   ` (9 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-24 15:48 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1520423768

Comment:
what fails on cross is .jsdep maketarget: `cd ui && yarn --no-progress --no-emoji`

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (28 preceding siblings ...)
  2023-04-24 15:48 ` dkwo
@ 2023-04-24 18:14 ` dkwo
  2023-04-24 21:10 ` dkwo
                   ` (8 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-24 18:14 UTC (permalink / raw)
  To: ml

[-- 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: 2095 bytes --]

From 80b05d0c467a367c2349accc17aae8de35ea4e4d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

---
 srcpkgs/chronograf/template | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..7ae8c0599c89 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,22 +1,23 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
@@ -24,12 +25,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (29 preceding siblings ...)
  2023-04-24 18:14 ` [PR PATCH] [Updated] " dkwo
@ 2023-04-24 21:10 ` dkwo
  2023-04-26 14:12 ` dkwo
                   ` (7 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-24 21:10 UTC (permalink / raw)
  To: ml

[-- 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: 2191 bytes --]

From 539d582435a94226c2dd16ef1ee73c77492cd58e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

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

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..43bf8efcc095 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,22 +1,23 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
@@ -24,12 +25,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
+	# npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (30 preceding siblings ...)
  2023-04-24 21:10 ` dkwo
@ 2023-04-26 14:12 ` dkwo
  2023-04-26 15:33 ` dkwo
                   ` (6 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-26 14:12 UTC (permalink / raw)
  To: ml

[-- 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: 2191 bytes --]

From 3c8557f353fd232bbe829169fd5d9d7d2da93acd Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

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

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..43bf8efcc095 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,22 +1,23 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
@@ -24,12 +25,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
+	# npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (31 preceding siblings ...)
  2023-04-26 14:12 ` dkwo
@ 2023-04-26 15:33 ` dkwo
  2023-05-10 14:47 ` dkwo
                   ` (5 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-04-26 15:33 UTC (permalink / raw)
  To: ml

[-- 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: 2372 bytes --]

From 797904f960b46ec70d2ee5b7c0335857a39b9eb5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

---
 srcpkgs/chronograf/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..8ee50a360b6e 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,35 +1,33 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
 	ppc*) broken="ftbfs in some js module" ;;
+	aarch64*) export npm_config_arch=arm64 ;;
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
+	# npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc
 }
 
 post_install() {
@@ -38,3 +36,4 @@ post_install() {
 	vmkdir usr/share/chronograf/
 	vcopy ${wrksrc}/${build_wrksrc}/canned usr/share/chronograf/canned
 }
+

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (32 preceding siblings ...)
  2023-04-26 15:33 ` dkwo
@ 2023-05-10 14:47 ` dkwo
  2023-05-11 14:35 ` [PR PATCH] [Updated] " dkwo
                   ` (4 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-05-10 14:47 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1542338123

Comment:
fixed upstream https://github.com/kriszyp/lmdb-js/issues/229, now i need to figure out how to make chronograf use lmdb@2.8.0

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (33 preceding siblings ...)
  2023-05-10 14:47 ` dkwo
@ 2023-05-11 14:35 ` dkwo
  2023-05-11 14:41 ` dkwo
                   ` (3 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-05-11 14:35 UTC (permalink / raw)
  To: ml

[-- 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: 6012 bytes --]

From e6eba7f021de471cecb84afe5717a7c8d4a93e0c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH 1/2] chronograf: update to 1.10.1, makedepends on nodejs,
 python3

---
 srcpkgs/chronograf/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..8ee50a360b6e 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,35 +1,33 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
+# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
 	ppc*) broken="ftbfs in some js module" ;;
+	aarch64*) export npm_config_arch=arm64 ;;
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
+	# npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc
 }
 
 post_install() {
@@ -38,3 +36,4 @@ post_install() {
 	vmkdir usr/share/chronograf/
 	vcopy ${wrksrc}/${build_wrksrc}/canned usr/share/chronograf/canned
 }
+

From c33953611717911bcdb9affbda3f500aeec0797c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 9 May 2023 13:40:08 -0400
Subject: [PATCH 2/2] chronograf: experiment

---
 srcpkgs/chronograf/patches/lmdb.patch      | 11 +++++++++++
 srcpkgs/chronograf/patches/lmdb2.patch     | 11 +++++++++++
 srcpkgs/chronograf/patches/noscripts.patch | 19 +++++++++++++++++++
 srcpkgs/chronograf/template                | 11 ++++++-----
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/chronograf/patches/lmdb.patch
 create mode 100644 srcpkgs/chronograf/patches/lmdb2.patch
 create mode 100644 srcpkgs/chronograf/patches/noscripts.patch

diff --git a/srcpkgs/chronograf/patches/lmdb.patch b/srcpkgs/chronograf/patches/lmdb.patch
new file mode 100644
index 000000000000..50dad7564246
--- /dev/null
+++ b/srcpkgs/chronograf/patches/lmdb.patch
@@ -0,0 +1,11 @@
+--- a/ui/package.json	2023-05-11 09:48:30.474868174 -0400
++++ b/ui/package.json	2023-05-11 09:54:26.175543653 -0400
+@@ -163,5 +163,8 @@
+     "reselect": "^3.0.1",
+     "rome": "^2.1.22",
+     "uuid": "^3.2.1"
++  },
++  "resolutions": {
++    "lmdb": "^2.8.0"
+   }
+ }
diff --git a/srcpkgs/chronograf/patches/lmdb2.patch b/srcpkgs/chronograf/patches/lmdb2.patch
new file mode 100644
index 000000000000..f79ff3fb11ac
--- /dev/null
+++ b/srcpkgs/chronograf/patches/lmdb2.patch
@@ -0,0 +1,11 @@
+--- a/package.json	2023-05-11 10:30:54.448958871 -0400
++++ b/package.json	2023-05-11 10:31:44.786945716 -0400
+@@ -32,5 +32,8 @@
+     "process": "^0.11.10",
+     "querystring-es3": "^0.2.1",
+     "util": "^0.12.4"
++  },
++  "resolutions": {
++     "lmdb": "^2.8.0"
+   }
+ }
diff --git a/srcpkgs/chronograf/patches/noscripts.patch b/srcpkgs/chronograf/patches/noscripts.patch
new file mode 100644
index 000000000000..cd633de59cd9
--- /dev/null
+++ b/srcpkgs/chronograf/patches/noscripts.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2023-05-09 14:10:03.975291850 -0400
++++ b/Makefile	2023-05-09 14:13:17.400831107 -0400
+@@ -59,7 +59,7 @@
+ 	@touch .bindata
+ 
+ .jssrc: $(UISOURCES)
+-	cd ui && yarn run clean && yarn run build
++	cd ui && yarn run clean && yarn --ignore-scripts run build
+ 	@touch .jssrc
+ 
+ dep: .jsdep .godep
+@@ -72,7 +72,7 @@
+ ifndef YARN
+ 	$(error Please install yarn 1.19.1+)
+ else
+-	cd ui && yarn --no-progress --no-emoji
++	cd ui && yarn --no-progress --no-emoji --ignore-scripts
+ 	@touch .jsdep
+ endif
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 8ee50a360b6e..3396750a3bd2 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -17,17 +17,19 @@ checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
-# nocross="see https://github.com/nodejs/node-gyp/issues/2817"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="yarn not available" ;;
 	ppc*) broken="ftbfs in some js module" ;;
-	aarch64*) export npm_config_arch=arm64 ;;
 esac
 
 pre_build() {
-	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
-	# npm_config_target_arch=arm64 npm_config_target_platform=linux npm_config_target_libc=glibc
+	export CFLAGS="$CFLAGS -fPIC"
+	export CXXFLAGS="$CXXFLAGS -fPIC"
+	# npm_config_target_arch=arm64
+	# export npm_config_target_platform=linux
+	# export npm_config_target_libc=musl
+	make .jsdep assets
 }
 
 post_install() {
@@ -36,4 +38,3 @@ post_install() {
 	vmkdir usr/share/chronograf/
 	vcopy ${wrksrc}/${build_wrksrc}/canned usr/share/chronograf/canned
 }
-

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (34 preceding siblings ...)
  2023-05-11 14:35 ` [PR PATCH] [Updated] " dkwo
@ 2023-05-11 14:41 ` dkwo
  2023-05-11 14:58 ` [PR PATCH] [Updated] " dkwo
                   ` (2 subsequent siblings)
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-05-11 14:41 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1544113449

Comment:
it works finally :)

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Updated] chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (35 preceding siblings ...)
  2023-05-11 14:41 ` dkwo
@ 2023-05-11 14:58 ` dkwo
  2023-06-02 19:02 ` [PR PATCH] [Merged]: " paper42
  2023-06-02 19:02 ` paper42
  38 siblings, 0 replies; 40+ messages in thread
From: dkwo @ 2023-05-11 14:58 UTC (permalink / raw)
  To: ml

[-- 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: 3261 bytes --]

From 8ff5536b82c03751cd58a9c090bc4debe6234f1e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 24 Apr 2023 11:45:46 -0400
Subject: [PATCH] chronograf: update to 1.10.1, makedepends on nodejs, python3

---
 srcpkgs/chronograf/patches/lmdb.patch      | 11 +++++++++++
 srcpkgs/chronograf/patches/noscripts.patch | 10 ++++++++++
 srcpkgs/chronograf/template                | 19 +++++++------------
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/chronograf/patches/lmdb.patch
 create mode 100644 srcpkgs/chronograf/patches/noscripts.patch

diff --git a/srcpkgs/chronograf/patches/lmdb.patch b/srcpkgs/chronograf/patches/lmdb.patch
new file mode 100644
index 000000000000..f79ff3fb11ac
--- /dev/null
+++ b/srcpkgs/chronograf/patches/lmdb.patch
@@ -0,0 +1,11 @@
+--- a/package.json	2023-05-11 10:30:54.448958871 -0400
++++ b/package.json	2023-05-11 10:31:44.786945716 -0400
+@@ -32,5 +32,8 @@
+     "process": "^0.11.10",
+     "querystring-es3": "^0.2.1",
+     "util": "^0.12.4"
++  },
++  "resolutions": {
++     "lmdb": "^2.8.0"
+   }
+ }
diff --git a/srcpkgs/chronograf/patches/noscripts.patch b/srcpkgs/chronograf/patches/noscripts.patch
new file mode 100644
index 000000000000..ef7c67e74857
--- /dev/null
+++ b/srcpkgs/chronograf/patches/noscripts.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2023-05-09 14:10:03.975291850 -0400
++++ b/Makefile	2023-05-09 14:13:17.400831107 -0400
+@@ -72,7 +72,7 @@
+ ifndef YARN
+ 	$(error Please install yarn 1.19.1+)
+ else
+-	cd ui && yarn --no-progress --no-emoji
++	cd ui && yarn --no-progress --no-emoji --ignore-scripts
+ 	@touch .jsdep
+ endif
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 01947c93feb7..ef562ad65c9e 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,19 +1,19 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.4
-revision=2
+version=1.10.1
+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
-
+changelog="https://raw.githubusercontent.com/influxdata/chronograf/master/CHANGELOG.md"
+distfiles="https://github.com/influxdata/chronograf/archive/${version}.tar.gz"
+checksum=d2fb4759f4f94d81dcde5c50fece46febd7f610ee7d9373fd000d7a9986a52d8
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"
 make_dirs="${_chronograf_homedir} 0755 _chronograf _chronograf"
@@ -24,12 +24,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	cd $wrksrc/ui
-	yarn install
-	export PATH=$PATH:${wrksrc}/ui/node_modules/.bin
-
-	cd $wrksrc
-	make assets
+	CFLAGS="$CFLAGS -fPIC" CXXFLAGS="$CXXFLAGS -fPIC" make .jsdep assets
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [PR PATCH] [Merged]: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (36 preceding siblings ...)
  2023-05-11 14:58 ` [PR PATCH] [Updated] " dkwo
@ 2023-06-02 19:02 ` paper42
  2023-06-02 19:02 ` paper42
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-06-02 19:02 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

chronograf: update to 1.10.0, makedepends on nodejs, python3
https://github.com/void-linux/void-packages/pull/42644

Description:
- 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 

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: chronograf: update to 1.10.0, makedepends on nodejs, python3
  2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 dkwo
                   ` (37 preceding siblings ...)
  2023-06-02 19:02 ` [PR PATCH] [Merged]: " paper42
@ 2023-06-02 19:02 ` paper42
  38 siblings, 0 replies; 40+ messages in thread
From: paper42 @ 2023-06-02 19:02 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42644#issuecomment-1574183329

Comment:
thank you :tada:

^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2023-06-02 19:02 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-07 16:49 [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3 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
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

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).