cri-tools/trunk/cri-tools-1.27.0-makefile.patch

   1 diff --git c/Makefile w/Makefile
   2 index 1b4bed6e..1210d1f1 100644
   3 --- c/Makefile
   4 +++ w/Makefile
   5 @@ -33,9 +33,10 @@ endif
   6  PROJECT := github.com/kubernetes-sigs/cri-tools
   7  BINDIR ?= /usr/local/bin
   8
   9 -VERSION := $(shell git describe --tags --dirty --always)
  10 -VERSION := $(VERSION:v%=%)
  11 -GO_LDFLAGS := -X $(PROJECT)/pkg/version.Version=$(VERSION)
  12 +VERSION ?= $(shell git describe --tags --dirty --always | sed 's/^v//')
  13 +CGO_ENABLED ?= 0
  14 +GOFLAGS ?= -trimpath
  15 +GO_LDFLAGS := $(GO_LDFLAGS) -X $(PROJECT)/pkg/version.Version=$(VERSION)
  16
  17  BUILD_PATH := $(shell pwd)/build
  18  BUILD_BIN_PATH := $(BUILD_PATH)/bin/$(GOOS)/$(GOARCH)
  19 @@ -64,18 +65,18 @@ critest:
  20         @$(MAKE) -B $(CRITEST)
  21
  22  $(CRITEST):
  23 -       CGO_ENABLED=0 $(GO_TEST) -c -o $@ \
  24 +       CGO_ENABLED=$(CGO_ENABLED) $(GO_TEST) -c -o $@ \
  25                 -ldflags '$(GO_LDFLAGS)' \
  26 -               -trimpath \
  27 +               $(GOFLAGS) \
  28              $(PROJECT)/cmd/critest
  29
  30  crictl:
  31         @$(MAKE) -B $(CRICTL)
  32
  33  $(CRICTL):
  34 -       CGO_ENABLED=0 $(GO_BUILD) -o $@ \
  35 +       CGO_ENABLED=$(CGO_ENABLED) $(GO_BUILD) -o $@ \
  36                 -ldflags '$(GO_LDFLAGS)' \
  37 -               -trimpath \
  38 +               $(GOFLAGS) \
  39                 $(PROJECT)/cmd/crictl
  40
  41  clean: