You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
1.3 KiB
21 lines
1.3 KiB
Index: src/github.com/containers/skopeo/Makefile |
|
--- src/github.com/containers/skopeo/Makefile.orig 2021-08-05 19:48:04.000000000 +0200 |
|
+++ src/github.com/containers/skopeo/Makefile 2021-08-06 21:55:59.037533000 +0200 |
|
@@ -32,7 +32,7 @@ |
|
# Multiple scripts are sensitive to this value, make sure it's exported/available |
|
# N/B: Need to use 'command -v' here for compatibility with MacOS. |
|
export CONTAINER_RUNTIME ?= $(if $(shell command -v podman),podman,docker) |
|
-GOMD2MAN ?= $(if $(shell command -v go-md2man),go-md2man,$(GOBIN)/go-md2man) |
|
+GOMD2MAN ?= md2man |
|
|
|
# Go module support: set `-mod=vendor` to use the vendored sources. |
|
# See also hack/make.sh. |
|
@@ -150,7 +150,7 @@ |
|
# Build w/o using containers |
|
.PHONY: bin/skopeo |
|
bin/skopeo: |
|
- $(GPGME_ENV) $(GO) build $(MOD_VENDOR) ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo |
|
+ $(GPGME_ENV) $(GO) build -v $(MOD_VENDOR) ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo |
|
bin/skopeo.%: |
|
GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build $(MOD_VENDOR) ${SKOPEO_LDFLAGS} -tags "containers_image_openpgp $(BUILDTAGS)" -o $@ ./cmd/skopeo |
|
local-cross: bin/skopeo.darwin.amd64 bin/skopeo.linux.arm bin/skopeo.linux.arm64 bin/skopeo.windows.386.exe bin/skopeo.windows.amd64.exe
|
|
|