* [PR PATCH] chronograf: update to 1.10.0, makedepends on nodejs, python3
@ 2023-03-07 16:49 dkwo
2023-03-07 16:49 ` dkwo
` (25 more replies)
0 siblings, 26 replies; 27+ 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] 27+ 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
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ 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] 27+ 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
2023-03-16 22:46 ` [PR PATCH] [Updated] " dkwo
25 siblings, 0 replies; 27+ 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] 27+ 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
25 siblings, 0 replies; 27+ 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] 27+ 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
25 siblings, 0 replies; 27+ 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] 27+ messages in thread
end of thread, other threads:[~2023-03-16 22:46 UTC | newest]
Thread overview: 27+ 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
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).