Received: from mail.cmpwn.com (mail.cmpwn.com [45.56.77.53]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 68DD6781A72 for <~alpine/aports@lists.alpinelinux.org>; Thu, 9 Jan 2020 19:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cmpwn.com; s=cmpwn; t=1578599570; bh=aTt7TRcvQTz70W3+ZiAnaKAx71ZsKAHhbP3w/8s++MU=; h=From:To:Cc:Subject:Date; b=u1HQWWgMwNQq+1WxcONIpXzUsitr0Qab0iUpDYulmN1AME7HRpBFd2rMN+znYjm9F bUpd4D5y7dGq27/ll4QG5mH6zDRiQNLU9NACA3GxC9DiIQyU6DlARZ/WfsL1uDyM2E B8KZX8a7vMZgXOctGrtxrMZGQc4Hl2qZdkPCtPlE= From: Drew DeVault To: ~alpine/aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [PATCH v2] community/alertmanager: fix LDFLAGS issues Date: Thu, 9 Jan 2020 14:53:48 -0500 Message-Id: <20200109195348.16021-1-sir@cmpwn.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This should(?) fix the build on aarch64. --- community/alertmanager/APKBUILD | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/community/alertmanager/APKBUILD b/community/alertmanager/APKBUILD index e61bbb2526..56a02011c6 100644 --- a/community/alertmanager/APKBUILD +++ b/community/alertmanager/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=alertmanager pkgver=0.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus Alertmanager" url="https://github.com/prometheus/alertmanager" arch="all" @@ -18,22 +18,19 @@ builddir="$srcdir/$pkgname-$pkgver" options="!check" # timing-sensitive upstream tests build() { - ldflags="-extldflags $LDFLAGS \ - -X github.com/prometheus/common/version.Version=$pkgver \ - -X github.com/prometheus/common/version.Revision=$pkgrel \ - -X github.com/prometheus/common/version.Branch=Alpine \ - -X github.com/prometheus/common/version.BuildUser=Alpine \ - -X github.com/prometheus/common/version.BuildDate=2020-01-08" - go build \ - -trimpath \ - -mod=vendor \ - -ldflags "$ldflags" \ - ./cmd/alertmanager - go build \ - -trimpath \ - -mod=vendor \ - -ldflags "$ldflags" \ - ./cmd/amtool + for cmd in amtool alertmanager + do + go build \ + -trimpath \ + -mod=vendor \ + -ldflags "-extldflags \"$LDFLAGS\" \ + -X github.com/prometheus/common/version.Version=$pkgver \ + -X github.com/prometheus/common/version.Revision=$pkgrel \ + -X github.com/prometheus/common/version.Branch=Alpine \ + -X github.com/prometheus/common/version.BuildUser=Alpine \ + -X github.com/prometheus/common/version.BuildDate=2020-01-08" \ + ./cmd/$cmd + done } check() { -- 2.24.1