From 30db2d83ba4b09539904ddb58a96e33de6b2a47c Mon Sep 17 00:00:00 2001 From: dkwo 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 " 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 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 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