Commit in vagrant/trunk (PKGBUILD)

[David Runge]

    Date: Tuesday, April 4, 2023 @ 12:02:51
  Author: dvzrv
Revision: 1434564

Apply go package guidelines.

Apply the go package guidelines to have full RELRO for vagrant and provide a 
working debug package.

Modified:
  vagrant/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-04-04 11:48:43 UTC (rev 1434563)
+++ PKGBUILD    2023-04-04 12:02:51 UTC (rev 1434564)
@@ -35,18 +35,22 @@
 }
 
 build() {
-  cd $pkgname-$pkgver
-  gem build $pkgname.gemspec
+  (
+    cd $pkgname-$pkgver
+    gem build $pkgname.gemspec
+  )
 
-  export GO111MODULE=off # golang 1.16 uses modules by default and packages 
below fail to compile
-  cd "$srcdir"/vagrant-installers/substrate/launcher
-  go get github.com/mitchellh/osext
+  (
+    export CGO_CPPFLAGS="${CPPFLAGS}"
+    export CGO_CFLAGS="${CFLAGS}"
+    export CGO_CXXFLAGS="${CXXFLAGS}"
+    export CGO_LDFLAGS="${LDFLAGS}"
+    export GOPATH="${srcdir}"
+    export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external 
-mod=readonly -modcacherw"
 
-  go build \
-    -trimpath \
-    -buildmode=pie \
-    -ldflags "-extldflags \"${LDFLAGS}\"" \
-    -o vagrant
+    cd vagrant-installers/substrate/launcher
+    go build -o $pkgname -ldflags "-compressdwarf=false -linkmode external 
-extldflags \"${LDFLAGS}\"" .
+  )
 }
 
 package() {