From 75f7f03cb68778053776cd99185805da8145d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 18 Jul 2018 14:00:15 +0200 Subject: [PATCH] Turn off DWARF compression by default as it is not supported by rpm/debuginfo --- ...warf-by-derfault-as-rpm-debuginfo-is.patch | 26 +++++++++++++++++++ golang.spec | 8 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0003-Don-t-compress-dwarf-by-derfault-as-rpm-debuginfo-is.patch diff --git a/0003-Don-t-compress-dwarf-by-derfault-as-rpm-debuginfo-is.patch b/0003-Don-t-compress-dwarf-by-derfault-as-rpm-debuginfo-is.patch new file mode 100644 index 0000000..da9131a --- /dev/null +++ b/0003-Don-t-compress-dwarf-by-derfault-as-rpm-debuginfo-is.patch @@ -0,0 +1,26 @@ +From 6d0f113b34e323234eeb279984af83ba98e61c10 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= +Date: Wed, 18 Jul 2018 09:42:28 +0200 +Subject: [PATCH 3/3] Don't compress dwarf by derfault as rpm/debuginfo is not + yet ready for it. + +--- + src/cmd/link/internal/ld/main.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go +index 23462f1154..565da989dd 100644 +--- a/src/cmd/link/internal/ld/main.go ++++ b/src/cmd/link/internal/ld/main.go +@@ -123,7 +123,7 @@ func Main(arch *sys.Arch, theArch Arch) { + flag.BoolVar(&ctxt.linkShared, "linkshared", false, "link against installed Go shared libraries") + flag.Var(&ctxt.LinkMode, "linkmode", "set link `mode`") + flag.Var(&ctxt.BuildMode, "buildmode", "set build `mode`") +- flag.BoolVar(&ctxt.compressDWARF, "compressdwarf", true, "compress DWARF if possible") ++ flag.BoolVar(&ctxt.compressDWARF, "compressdwarf", false, "compress DWARF if possible") + objabi.Flagfn1("B", "add an ELF NT_GNU_BUILD_ID `note` when using ELF", addbuildinfo) + objabi.Flagfn1("L", "add specified `directory` to library path", func(a string) { Lflag(ctxt, a) }) + objabi.AddVersionFlag() // -V +-- +2.14.4 + diff --git a/golang.spec b/golang.spec index 7568ab6..303ef8b 100644 --- a/golang.spec +++ b/golang.spec @@ -106,7 +106,7 @@ Name: golang Version: 1.11 -Release: 0.beta1.1%{?dist}.1 +Release: 0.beta1.2%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -184,6 +184,7 @@ Requires: go-srpm-macros Patch1: 0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch Patch2: 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch Patch3: 0001-cmd-go-call-flag.Parse-to-properly-initialize-test-e.patch +Patch4: 0003-Don-t-compress-dwarf-by-derfault-as-rpm-debuginfo-is.patch # Having documentation separate was broken Obsoletes: %{name}-docs < 1.1-4 @@ -310,6 +311,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE1} ./src/runtime/ @@ -546,6 +548,10 @@ fi %endif %changelog +* Wed Jul 18 2018 Jakub Čajka - 1.11-0.beta1.2 +- Turn off DWARF compression by default as it is not supported by rpm/debuginfo +- Related: BZ#1602096 + * Fri Jul 13 2018 Fedora Release Engineering - 1.11-0.beta1.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild