On 2025/02/11 17:11, Lucas Raab wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2025/02/11 17:11:33
>
> Modified files:
> sysutils/grafana: Makefile distinfo
> sysutils/grafana/patches: patch-conf_sample_ini
> sysutils/grafana/pkg: PLIST
>
> Log message:
> sysutils/grafana: update to 11.5.1
>
i386 build fails (see errors below), I'd probably just add NOT_FOR_ARCHS.
additionally, gtar isn't needed any more, and -p=1 from MODGO_GOFLAGS
doesn't seem to getting propagated onwards properly, so set GOMAXPROCS
to MAKE_JOBS to reduce the number of concurrent threads (it still
seems to run some in parallel, but at least it's a bit saner this way).
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/grafana/Makefile,v
diff -u -p -r1.43 Makefile
--- Makefile 23 Dec 2024 23:34:10 -0000 1.43
+++ Makefile 17 Feb 2025 14:53:52 -0000
@@ -1,3 +1,6 @@
+# various undefined functions/constants in modernc.org/sqlite/lib
+NOT_FOR_ARCHS = i386
+
COMMENT = monitoring and metric analytics dashboards
V = 11.4.0
@@ -5,8 +8,6 @@ DISTNAME = grafana+vendor-$V
WRKDIST = ${WRKDIR}/grafana-$V
EXTRACT_SUFX = .tar.zst
PKGNAME = grafana-$V
-# running into the too long filenames now
-TAR = ${LOCALBASE}/bin/gtar
MAINTAINER = Lucas Raab <[email protected]>
@@ -34,8 +35,7 @@ WANTLIB += c pthread
MODGO_GO111MODULE = on
MODGO_FLAGS += -ldflags="-w -X main.version=$V"
-
-BUILD_DEPENDS = archivers/gtar
+MAKE_ENV = GOMAXPROCS=${MAKE_JOBS}
post-extract:
mv ${WRKDIR}/grafana-v${V}/public/build \
go build -ldflags -w -X main.version=11.5.0-pre -X main.commit=unknown-dev -X
main.buildstamp=1739802363 -X main.build
Branch=main -o ./bin/openbsd-386/grafana ./pkg/cmd/grafana
# modernc.org/sqlite/lib
vendor/modernc.org/sqlite/lib/defs.go:13:35: undefined: sqlite3_index_constraint
vendor/modernc.org/sqlite/lib/defs.go:14:35: undefined: sqlite3_index_orderby
vendor/modernc.org/sqlite/lib/defs.go:15:35: undefined:
sqlite3_index_constraint_usage
vendor/modernc.org/sqlite/lib/mutex.go:19:5: undefined: Xsqlite3_threadsafe
vendor/modernc.org/sqlite/lib/mutex.go:29:11: undefined: Xsqlite3_config
vendor/modernc.org/sqlite/lib/mutex.go:29:32: undefined: SQLITE_CONFIG_MUTEX
vendor/modernc.org/sqlite/lib/mutex.go:29:122: undefined: SQLITE_OK
vendor/modernc.org/sqlite/lib/mutex.go:30:8: undefined: Xsqlite3_errstr
vendor/modernc.org/sqlite/lib/mutex.go:40:17: undefined: Sqlite3_mutex_methods
vendor/modernc.org/sqlite/lib/mutex.go:239:46: undefined: SQLITE_OK
vendor/modernc.org/sqlite/lib/mutex.go:239:46: too many errors
exit status 1
exit status 1
*** Error 1 in sysutils/grafana (Makefile:50 'do-build')
