From b09e05dea2e391631ac75f0afa19836d60e1ddd3 Mon Sep 17 00:00:00 2001 From: dkwo 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 " 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 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() {