update pkgbuild, go-pie replaced

2 files changed, 12 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 038aa2832560..03365ede53e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,8 +5,7 @@ pkgbase = immortal
 	url = https://immortal.run
 	arch = x86_64
 	license = BSD
-	makedepends = dep
-	makedepends = go-pie
+	makedepends = go
 	depends = glibc
 	source = immortal-0.24.3.tar.gz::https://github.com/immortal/immortal/archive/0.24.3.tar.gz
 	sha256sums = e31d5afb9028fb5047b5a2cc5f96c844f6480d600643a12075550f497e65f5cb
diff --git a/PKGBUILD b/PKGBUILD
index de04de29ca54..52b051a3b273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,40 +8,24 @@ arch=('x86_64')
 url='https://immortal.run'
 license=('BSD')
 depends=('glibc')
-makedepends=('dep' 'go-pie')
+makedepends=('go')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/immortal/immortal/archive/${pkgver}.tar.gz")
 sha256sums=('e31d5afb9028fb5047b5a2cc5f96c844f6480d600643a12075550f497e65f5cb')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir -p $srcdir/go
-  export GOPATH="${srcdir}"/go
-  export PATH=$PATH:$GOPATH/bin
-  go get -d -v ./...
+  mkdir -p build/
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/cmd/immortal"
-  export GOPATH="${srcdir}"/go
-  export PATH=$PATH:$GOPATH/bin
-  go build \
-    -mod=mod \
-    -trimpath \
-    -ldflags "-extldflags $LDFLAGS" \
-    -o $srcdir/immortal .
-  cd "${srcdir}/${pkgname}-${pkgver}/cmd/immortalctl"
-  go build \
-    -mod=mod \
-    -trimpath \
-    -ldflags "-extldflags $LDFLAGS" \
-    -o $srcdir/immortalctl .
-  cd "${srcdir}/${pkgname}-${pkgver}/cmd/immortaldir"
-  go build \
-    -mod=mod \
-    -trimpath \
-    -ldflags "-extldflags $LDFLAGS" \
-    -o $srcdir/immortaldir .
   cd "${srcdir}/${pkgname}-${pkgver}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  go build -o build ./...
   gzip --force man/immortal.8
   gzip --force man/immortalctl.8
   gzip --force man/immortaldir.8
@@ -49,14 +33,13 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  install -Dm755 ../immortal -t "${pkgdir}/usr/bin/"
-  install -Dm755 ../immortalctl -t "${pkgdir}/usr/bin/"
-  install -Dm755 ../immortaldir -t "${pkgdir}/usr/bin/"
+  install -Dm755 build/immortal -t "${pkgdir}/usr/bin/"
+  install -Dm755 build/immortalctl -t "${pkgdir}/usr/bin/"
+  install -Dm755 build/immortaldir -t "${pkgdir}/usr/bin/"
   install -Dm644 man/immortal.8.gz -t "${pkgdir}/usr/share/man/man8"
   install -Dm644 man/immortalctl.8.gz -t "${pkgdir}/usr/share/man/man8"
   install -Dm644 man/immortaldir.8.gz -t "${pkgdir}/usr/share/man/man8"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   mkdir -p "${pkgdir}/usr/share/doc/immortal/"
   cp -aR example "${pkgdir}/usr/share/doc/immortal/"
-  go clean -modcache #Remove go libraries
 }
\ No newline at end of file