diff --git a/go.mod b/go.mod index d44108820..64c006711 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/valyala/fastjson v1.6.3 github.com/valyala/fastrand v1.1.0 github.com/valyala/fasttemplate v1.2.1 - github.com/valyala/gozstd v1.15.1 + github.com/valyala/gozstd v1.16.0 github.com/valyala/quicktemplate v1.7.0 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 diff --git a/go.sum b/go.sum index 3b5f2c24d..e1750b8ca 100644 --- a/go.sum +++ b/go.sum @@ -976,8 +976,8 @@ github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/gozstd v1.15.1 h1:hpmJYWOpNs0rjDOMdbwWZplfNlfh1tOy0v7XiR9+iGQ= -github.com/valyala/gozstd v1.15.1/go.mod h1:y5Ew47GLlP37EkTB+B4s7r6A5rdaeB7ftbl9zoYiIPQ= +github.com/valyala/gozstd v1.16.0 h1:nunfqpzx8Nq9itKYCgvmKlgM4LBQ8rcQPJ2ARKISu+0= +github.com/valyala/gozstd v1.16.0/go.mod h1:y5Ew47GLlP37EkTB+B4s7r6A5rdaeB7ftbl9zoYiIPQ= github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= github.com/valyala/quicktemplate v1.7.0 h1:LUPTJmlVcb46OOUY3IeD9DojFpAVbsG+5WFTcjMJzCM= diff --git a/vendor/github.com/valyala/gozstd/Makefile b/vendor/github.com/valyala/gozstd/Makefile index c97c0ae32..8a33632b1 100644 --- a/vendor/github.com/valyala/gozstd/Makefile +++ b/vendor/github.com/valyala/gozstd/Makefile @@ -5,12 +5,11 @@ GOOS_GOARCH_NATIVE := $(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) LIBZSTD_NAME := libzstd_$(GOOS_GOARCH).a ZSTD_VERSION ?= v1.5.1 MUSL_BUILDER_IMAGE=golang:1.17.6-alpine -BUILDER_IMAGE := local/builder_musl:2.0.0-$(shell echo $(MUSL_BUILDER_IMAGE) | tr : _) +BUILDER_IMAGE := local/builder_musl:2.0.0-$(shell echo $(MUSL_BUILDER_IMAGE) | tr : _)-1 -.PHONY: libzstd.a +.PHONY: libzstd.a $(LIBZSTD_NAME) libzstd.a: $(LIBZSTD_NAME) - $(LIBZSTD_NAME): ifeq ($(GOOS_GOARCH),$(GOOS_GOARCH_NATIVE)) cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a @@ -28,6 +27,10 @@ ifeq ($(GOOS_GOARCH),linux_musl_amd64) cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a mv zstd/lib/libzstd.a libzstd_linux_musl_amd64.a endif +ifeq ($(GOOS_GOARCH),linux_musl_arm64) + cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a + mv zstd/lib/libzstd.a libzstd_linux_musl_arm64.a +endif endif package-builder: @@ -45,6 +48,15 @@ package-musl: package-builder $(DOCKER_OPTS) \ $(BUILDER_IMAGE) \ sh -c "GOOS=linux_musl make clean libzstd.a" + docker run --rm \ + --user $(shell id -u):$(shell id -g) \ + --mount type=bind,src="$(shell pwd)",dst=/zstd \ + --env CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc \ + -w /zstd \ + $(DOCKER_OPTS) \ + $(BUILDER_IMAGE) \ + sh -c "GOARCH=arm64 GOOS=linux_musl make clean libzstd.a" + clean: rm -f $(LIBZSTD_NAME) diff --git a/vendor/github.com/valyala/gozstd/libzstd_darwin_amd64.a b/vendor/github.com/valyala/gozstd/libzstd_darwin_amd64.a index 25b7a6cf5..7157fb394 100644 Binary files a/vendor/github.com/valyala/gozstd/libzstd_darwin_amd64.a and b/vendor/github.com/valyala/gozstd/libzstd_darwin_amd64.a differ diff --git a/vendor/github.com/valyala/gozstd/libzstd_darwin_arm64.a b/vendor/github.com/valyala/gozstd/libzstd_darwin_arm64.a index c049c24d1..d6116c1ea 100644 Binary files a/vendor/github.com/valyala/gozstd/libzstd_darwin_arm64.a and b/vendor/github.com/valyala/gozstd/libzstd_darwin_arm64.a differ diff --git a/vendor/github.com/valyala/gozstd/libzstd_freebsd_amd64.a b/vendor/github.com/valyala/gozstd/libzstd_freebsd_amd64.a index 394a31a31..7c992f93f 100644 Binary files a/vendor/github.com/valyala/gozstd/libzstd_freebsd_amd64.a and b/vendor/github.com/valyala/gozstd/libzstd_freebsd_amd64.a differ diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_arm64.go b/vendor/github.com/valyala/gozstd/libzstd_linux_arm64.go index e03ba9eca..07047cf99 100644 --- a/vendor/github.com/valyala/gozstd/libzstd_linux_arm64.go +++ b/vendor/github.com/valyala/gozstd/libzstd_linux_arm64.go @@ -1,3 +1,6 @@ +//go:build !musl +// +build !musl + package gozstd /* diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.a b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.a new file mode 100644 index 000000000..8a40a9c1a Binary files /dev/null and b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.a differ diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.go b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.go new file mode 100644 index 000000000..b4070351d --- /dev/null +++ b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_arm64.go @@ -0,0 +1,9 @@ +//go:build musl +// +build musl + +package gozstd + +/* +#cgo LDFLAGS: ${SRCDIR}/libzstd_linux_musl_arm64.a +*/ +import "C" diff --git a/vendor/modules.txt b/vendor/modules.txt index f0c1b2fd4..bf53fe0de 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -231,7 +231,7 @@ github.com/valyala/fastrand # github.com/valyala/fasttemplate v1.2.1 ## explicit; go 1.12 github.com/valyala/fasttemplate -# github.com/valyala/gozstd v1.15.1 +# github.com/valyala/gozstd v1.16.0 ## explicit; go 1.12 github.com/valyala/gozstd # github.com/valyala/histogram v1.2.0