From b0d69812ab5f5d84df60f662a7a77910a926bc5d 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 332a90fb05466d710c1376287e5c111b2fc8bb1c Mon Sep 17 00:00:00 2001 From: dkwo 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 " 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