jchaloup pushed to golang-github-prometheus-prometheus (master). "Add debug info (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 13 14:37:58 UTC 2015


From 401be99ce6ded48572ff0cc58b2a177089859dc6 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 13 May 2015 16:23:03 +0200
Subject: Add debug info - related: #1190426


diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec
index d425c58..f2c3a3c 100644
--- a/golang-github-prometheus-prometheus.spec
+++ b/golang-github-prometheus-prometheus.spec
@@ -1,4 +1,9 @@
+%if 0%{?fedora}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
+%else
 %global debug_package   %{nil}
+%endif
 %global provider        github
 %global provider_tld    com
 %global project         prometheus
@@ -9,7 +14,7 @@
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        0.13.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Prometheus monitoring system and time series database
 License:        ASL 2.0
 URL:            https://%{import_path}
@@ -132,7 +137,7 @@ export BUILDDATE=$(date +%Y%m%d-%H:%M:%S)
 make -C web
 
 # build prometheus
-go build -o bin/prometheus -a -ldflags "-X main.buildVersion %{version} -X main.buildRevision %{shortcommit} -X main.buildBranch master -X main.buildUser fedora -X main.buildDate ${BUILDDATE} -X main.goVersion ${GO_VERSION}" .
+go build -v -x -o bin/prometheus -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X main.buildVersion %{version} -X main.buildRevision %{shortcommit} -X main.buildBranch master -X main.buildUser fedora -X main.buildDate ${BUILDDATE} -X main.goVersion ${GO_VERSION}" .
 
 %install
 install -D -p -m 0755 bin/%{repo} %{buildroot}%{_bindir}/%{repo}
@@ -189,6 +194,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}/config
 %{_bindir}/%{repo}
 
 %changelog
+* Wed May 13 2015 jchaloup <jchaloup at redhat.com> - 0.13.3-2
+- Add debug info
+  related: #1190426
+
 * Tue May 12 2015 jchaloup <jchaloup at redhat.com> - 0.13.3-1
 - Update to 0.13.3
   related: #1190426
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/golang-github-prometheus-prometheus.git/commit/?h=master&id=401be99ce6ded48572ff0cc58b2a177089859dc6


More information about the scm-commits mailing list