diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /sysutils/skopeo/files/patch-Makefile | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'sysutils/skopeo/files/patch-Makefile')
| -rw-r--r-- | sysutils/skopeo/files/patch-Makefile | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sysutils/skopeo/files/patch-Makefile b/sysutils/skopeo/files/patch-Makefile new file mode 100644 index 000000000000..9e47fcbdd889 --- /dev/null +++ b/sysutils/skopeo/files/patch-Makefile @@ -0,0 +1,23 @@ +--- Makefile.orig 2025-10-17 08:57:36 UTC ++++ Makefile +@@ -84,7 +84,7 @@ EXTRA_LDFLAGS ?= + GIT_COMMIT := $(shell GIT_CEILING_DIRECTORIES=$$(cd ..; pwd) git rev-parse HEAD 2> /dev/null || true) + + EXTRA_LDFLAGS ?= +-SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} $(EXTRA_LDFLAGS)' ++SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit="unknown" $(EXTRA_LDFLAGS)' + + MANPAGES_MD = $(wildcard docs/*.md) + MANPAGES ?= $(MANPAGES_MD:%.md=%) +@@ -131,9 +131,9 @@ bin/skopeo: + # Build w/o using containers + .PHONY: bin/skopeo + bin/skopeo: +- $(GO) build ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo ++ $(GO) build -buildvcs=false ${GO_DYN_FLAGS} ${SKOPEO_LDFLAGS} -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o $@ ./cmd/skopeo + bin/skopeo.%: +- GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build ${SKOPEO_LDFLAGS} -tags "containers_image_openpgp $(BUILDTAGS)" -o $@ ./cmd/skopeo ++ GOOS=$(word 2,$(subst ., ,$@)) GOARCH=$(word 3,$(subst ., ,$@)) $(GO) build -buildvcs=false ${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 + + $(MANPAGES): %: %.md |