[arch-commits] Commit in influxdb/trunk (PKGBUILD)

[Morten Linderud]

    Date: Sunday, August 16, 2020 @ 20:58:10
  Author: foxboron
Revision: 681927

upgpkg: influxdb 1.8.2-1

Modified:
  influxdb/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-16 20:58:06 UTC (rev 681926)
+++ PKGBUILD	2020-08-16 20:58:10 UTC (rev 681927)
@@ -6,7 +6,7 @@
 # Contributor: Ben Alex <ben.alex at acegi.com.au>
 
 pkgname=influxdb
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 pkgdesc='Scalable datastore for metrics, events, and real-time analytics'
 arch=('x86_64')
@@ -16,23 +16,29 @@
 backup=('etc/influxdb/influxdb.conf')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/influxdata/influxdb/archive/v${pkgver}.tar.gz"
         "fix-go114.patch::https://github.com/Foxboron/influxdb/commit/f8453b48862b50fe44021e320332f75e32457f29.patch"
+        "fix-go115.patch::https://github.com/influxdata/influxdb/commit/3a03ad500a4b2bba65a4af74995ad54e88de7210.patch"
         "influxdb.sysusers"
         "influxdb.tmpfiles")
-sha256sums=('d811be2ec684ea224e1097bd0051e0f6dfcd30cdd1656d55e48883d61ce47ce9'
+sha256sums=('59ee1d3bc591d932acad918f3a46b07207beed9c0e717ee28da8c9565e646eda'
             '2812f5cd31bdf6b9f587d471c249fb90ea58c4000ce52e3b91de7b17ca74dc7d'
+            '616ce43eebc1cbbe5d6376dd6306ffddc3aa1ab0cd396e1b9918ae43e6a27572'
             '809cca823ae3027984bc7ace70db75753d7d0d4f6658a36db9d94a33054ca5e9'
             'e2aa59413a6204737383b86cedefd866d7073f56ace5b89aad38c530cc86e60c')
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -Np1 < "../fix-go114.patch"
+  patch -Np1 < "$srcdir/fix-go114.patch"
+  patch -Np1 < "$srcdir/fix-go115.patch"
+  mkdir -p build
 }
 
 build(){
   cd "$pkgname-$pkgver"
-  export CGO_LDFLAGS="$LDFLAGS"
-  export GOFLAGS="-buildmode=pie -trimpath"
-  _LDFLAGS="-X main.version=$pkgver -X main.branch=master"
-  mkdir -p build
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  _LDFLAGS="-linkmode external -X main.version=$pkgver -X main.branch=master"
   go build -v -ldflags="$_LDFLAGS" -o build ./cmd/...
   cd "man"
   make
@@ -40,8 +46,11 @@
 
 check(){
   cd "$pkgname-$pkgver"
-  export CGO_LDFLAGS="$LDFLAGS"
-  export GOFLAGS="-buildmode=pie -trimpath"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
   go test ./...
 }