Using the new go package guidelines.

3 files changed, 18 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa68e23c195e..7aa953fa6b3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = skaffold
 	source = skaffold-1.11.0.tar.gz::https://github.com/GoogleContainerTools/skaffold/archive/v1.11.0.tar.gz
 	source = build_info.patch
 	sha256sums = 1803f372cee128981e4e5a559d572738a64e2dda171f194697d6888ebfc67e3d
-	sha256sums = 9363c1f0dda736d3c055368844f36c6b17850a8f576e834737032ea54aabe780
+	sha256sums = e90797011d2f79c79a6b184a5e9c35c4e5c582622d075b0022675b96fccefc46
 
 pkgname = skaffold
 
diff --git a/PKGBUILD b/PKGBUILD
index ba118ccb28c1..e22d17967956 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ source=(
 )
 sha256sums=(
   "1803f372cee128981e4e5a559d572738a64e2dda171f194697d6888ebfc67e3d"
-  "9363c1f0dda736d3c055368844f36c6b17850a8f576e834737032ea54aabe780"
+  "e90797011d2f79c79a6b184a5e9c35c4e5c582622d075b0022675b96fccefc46"
 )
 _commit="b1346ef1caded079c5abf11e5c0daae2322c9c6b"
 
@@ -37,10 +37,20 @@ prepare() {
 
 build() {
   cd "${srcdir}/gopath/src/github.com/GoogleContainerTools/${pkgname}"
-  GOPATH="${srcdir}/gopath" PATH="${PATH}:${GOPATH}/bin" VERSION="v${pkgver}" COMMIT="${_commit}" TREE_STATE="clean" make install
+  export GOPATH="${srcdir}/gopath"
+  export PATH="${PATH}:${GOPATH}/bin"
+  export VERSION="v${pkgver}"
+  export COMMIT="${_commit}"
+  export TREE_STATE="clean"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -mod=readonly -modcacherw -x -v"
+  make install
 
   # To avoid issues deleting directories next time
-  GOPATH="${srcdir}" go clean --modcache
+  go clean --modcache
 }
 
 package() {
diff --git a/build_info.patch b/build_info.patch
index 868d4679ca49..9b587d8219b3 100644
--- a/build_info.patch
+++ b/build_info.patch
@@ -1,9 +1,9 @@
 diff --git a/Makefile b/Makefile
-index 1f6ee7c..88f763e 100644
+index dd22ea0..aa47490 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -32,7 +32,8 @@ SUPPORTED_PLATFORMS := linux-$(GOARCH) darwin-$(GOARCH) windows-$(GOARCH).exe
- BUILD_PACKAGE = $(REPOPATH)/cmd/skaffold
+@@ -35,7 +35,8 @@ SKAFFOLD_TEST_PACKAGES = ./pkg/skaffold/... ./cmd/... ./hack/... ./pkg/webhook/.
+ GO_FILES = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/diag/*")
  
  VERSION_PACKAGE = $(REPOPATH)/pkg/skaffold/version
 -COMMIT = $(shell git rev-parse HEAD)
@@ -12,7 +12,7 @@ index 1f6ee7c..88f763e 100644
  
  ifeq "$(strip $(VERSION))" ""
   override VERSION = $(shell git describe --always --tags --dirty)
-@@ -57,7 +58,7 @@ GO_BUILD_TAGS_windows := ""
+@@ -52,7 +53,7 @@ GO_BUILD_TAGS_windows = "release"
  GO_LDFLAGS = -X $(VERSION_PACKAGE).version=$(VERSION)
  GO_LDFLAGS += -X $(VERSION_PACKAGE).buildDate=$(shell date +'%Y-%m-%dT%H:%M:%SZ')
  GO_LDFLAGS += -X $(VERSION_PACKAGE).gitCommit=$(COMMIT)