Update upstream source from tag 'upstream/1.16.0+ds1'
Update to upstream version '1.16.0+ds1'
with Debian dir 1afc55dfcca10cb1ee38fadee238637cb851839c
Guillem Jover
2 years ago
| 0 | 0 |
tags
|
| 1 | |
|
| 2 | |
.pc/
|
| 3 | |
_build/
|
| 2 | 2 |
GOOS_GOARCH := $(GOOS)_$(GOARCH)
|
| 3 | 3 |
GOOS_GOARCH_NATIVE := $(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
|
| 4 | 4 |
LIBZSTD_NAME := libzstd_$(GOOS_GOARCH).a
|
| 5 | |
ZSTD_VERSION ?= v1.5.0
|
| 6 | |
MUSL_BUILDER_IMAGE=golang:1.17.1-alpine
|
| 7 | |
BUILDER_IMAGE := local/builder_musl:2.0.0-$(shell echo $(MUSL_BUILDER_IMAGE) | tr : _)
|
|
5 |
ZSTD_VERSION ?= v1.5.1
|
|
6 |
MUSL_BUILDER_IMAGE=golang:1.17.6-alpine
|
|
7 |
BUILDER_IMAGE := local/builder_musl:2.0.0-$(shell echo $(MUSL_BUILDER_IMAGE) | tr : _)-1
|
| 8 | 8 |
|
| 9 | |
.PHONY: libzstd.a
|
|
9 |
.PHONY: libzstd.a $(LIBZSTD_NAME)
|
| 10 | 10 |
|
| 11 | 11 |
libzstd.a: $(LIBZSTD_NAME)
|
| 12 | |
|
| 13 | 12 |
$(LIBZSTD_NAME):
|
| 14 | 13 |
ifeq ($(GOOS_GOARCH),$(GOOS_GOARCH_NATIVE))
|
| 15 | 14 |
cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a
|
|
| 26 | 25 |
ifeq ($(GOOS_GOARCH),linux_musl_amd64)
|
| 27 | 26 |
cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a
|
| 28 | 27 |
mv zstd/lib/libzstd.a libzstd_linux_musl_amd64.a
|
|
28 |
endif
|
|
29 |
ifeq ($(GOOS_GOARCH),linux_musl_arm64)
|
|
30 |
cd zstd/lib && ZSTD_LEGACY_SUPPORT=0 MOREFLAGS=$(MOREFLAGS) $(MAKE) clean libzstd.a
|
|
31 |
mv zstd/lib/libzstd.a libzstd_linux_musl_arm64.a
|
| 29 | 32 |
endif
|
| 30 | 33 |
endif
|
| 31 | 34 |
|
|
| 44 | 47 |
$(DOCKER_OPTS) \
|
| 45 | 48 |
$(BUILDER_IMAGE) \
|
| 46 | 49 |
sh -c "GOOS=linux_musl make clean libzstd.a"
|
|
50 |
docker run --rm \
|
|
51 |
--user $(shell id -u):$(shell id -g) \
|
|
52 |
--mount type=bind,src="$(shell pwd)",dst=/zstd \
|
|
53 |
--env CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc \
|
|
54 |
-w /zstd \
|
|
55 |
$(DOCKER_OPTS) \
|
|
56 |
$(BUILDER_IMAGE) \
|
|
57 |
sh -c "GOARCH=arm64 GOOS=linux_musl make clean libzstd.a"
|
|
58 |
|
| 47 | 59 |
|
| 48 | 60 |
clean:
|
| 49 | 61 |
rm -f $(LIBZSTD_NAME)
|
| 0 | 0 |
ARG builder_image
|
| 1 | 1 |
FROM $builder_image
|
| 2 | |
RUN apk add gcc musl-dev make git --no-cache⏎
|
|
2 |
RUN apk add wget gcc musl-dev make git --no-cache && \
|
|
3 |
mkdir /opt/cross-builder && \
|
|
4 |
wget https://musl.cc/aarch64-linux-musl-cross.tgz -O /opt/cross-builder/aarch64-musl.tgz && \
|
|
5 |
cd /opt/cross-builder && \
|
|
6 |
tar zxf aarch64-musl.tgz -C ./ && \
|
|
7 |
rm /opt/cross-builder/aarch64-musl.tgz
|
|
8 |
|
| 252 | 252 |
}
|
| 253 | 253 |
zw.ResetWriterParams(&bb, ¶ms)
|
| 254 | 254 |
|
| 255 | |
io.Copy(zw, bytes.NewReader(bbOrig.Bytes()))
|
|
255 |
if _, err := io.Copy(zw, bytes.NewReader(bbOrig.Bytes())); err != nil {
|
|
256 |
t.Fatalf("cannot copy data: %s", err)
|
|
257 |
}
|
| 256 | 258 |
if err := zw.Close(); err != nil {
|
| 257 | 259 |
t.Fatalf("error when closing zw: %s", err)
|
| 258 | 260 |
}
|