diff --git a/go.mod b/go.mod index 5229b665a..0ed2485e2 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,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.12.0 + github.com/valyala/gozstd v1.13.0 github.com/valyala/histogram v1.2.0 github.com/valyala/quicktemplate v1.7.0 go.uber.org/atomic v1.9.0 // indirect diff --git a/go.sum b/go.sum index 1ba0c44ab..dddc2a0b1 100644 --- a/go.sum +++ b/go.sum @@ -942,8 +942,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.12.0 h1:CVG/hZKv3VqgiesiDrFrkgTIwDr5+9yaRaFDgMso5lI= -github.com/valyala/gozstd v1.12.0/go.mod h1:y5Ew47GLlP37EkTB+B4s7r6A5rdaeB7ftbl9zoYiIPQ= +github.com/valyala/gozstd v1.13.0 h1:M9qgbElBZsHlh8a4jjHO4lY42xLJeb+KWVBwFBAapRo= +github.com/valyala/gozstd v1.13.0/go.mod h1:y5Ew47GLlP37EkTB+B4s7r6A5rdaeB7ftbl9zoYiIPQ= github.com/valyala/histogram v1.1.2/go.mod h1:CZAr6gK9dbD7hYx2s8WSPh0p5x5wETjC+2b3PJVtEdg= github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= diff --git a/vendor/github.com/valyala/gozstd/Makefile b/vendor/github.com/valyala/gozstd/Makefile index 08dd36880..c84683861 100644 --- a/vendor/github.com/valyala/gozstd/Makefile +++ b/vendor/github.com/valyala/gozstd/Makefile @@ -4,6 +4,8 @@ GOOS_GOARCH := $(GOOS)_$(GOARCH) GOOS_GOARCH_NATIVE := $(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) LIBZSTD_NAME := libzstd_$(GOOS_GOARCH).a ZSTD_VERSION ?= v1.5.0 +MUSL_BUILDER_IMAGE=golang:1.17.1-alpine +BUILDER_IMAGE := local/builder_musl:2.0.0-$(shell echo $(MUSL_BUILDER_IMAGE) | tr : _) .PHONY: libzstd.a @@ -22,7 +24,27 @@ ifeq ($(GOOS_GOARCH),linux_arm64) cd zstd/lib && CC=aarch64-linux-gnu-gcc ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a mv zstd/lib/libzstd.a libzstd_linux_arm64.a endif +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 +endif + +package-builder: + (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BUILDER_IMAGE)$$') \ + || docker build \ + --build-arg builder_image=$(MUSL_BUILDER_IMAGE) \ + --tag $(BUILDER_IMAGE) \ + builder + +package-musl: package-builder + docker run --rm \ + --user $(shell id -u):$(shell id -g) \ + --mount type=bind,src="$(shell pwd)",dst=/zstd \ + -w /zstd \ + $(DOCKER_OPTS) \ + $(BUILDER_IMAGE) \ + sh -c "GOOS=linux_musl make clean libzstd.a" clean: rm -f $(LIBZSTD_NAME) diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_amd64.go b/vendor/github.com/valyala/gozstd/libzstd_linux_amd64.go index 50c4c5332..82413af2e 100644 --- a/vendor/github.com/valyala/gozstd/libzstd_linux_amd64.go +++ b/vendor/github.com/valyala/gozstd/libzstd_linux_amd64.go @@ -1,3 +1,5 @@ +// +build !musl + package gozstd /* diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.a b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.a new file mode 100644 index 000000000..c83987522 Binary files /dev/null and b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.a differ diff --git a/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.go b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.go new file mode 100644 index 000000000..67f6dd28f --- /dev/null +++ b/vendor/github.com/valyala/gozstd/libzstd_linux_musl_amd64.go @@ -0,0 +1,8 @@ +// +build musl + +package gozstd + +/* +#cgo LDFLAGS: ${SRCDIR}/libzstd_linux_musl_amd64.a +*/ +import "C" diff --git a/vendor/modules.txt b/vendor/modules.txt index 4cf5dca78..f8269c8ec 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -209,7 +209,7 @@ github.com/valyala/fastrand # github.com/valyala/fasttemplate v1.2.1 ## explicit github.com/valyala/fasttemplate -# github.com/valyala/gozstd v1.12.0 +# github.com/valyala/gozstd v1.13.0 ## explicit github.com/valyala/gozstd # github.com/valyala/histogram v1.2.0