diff options
| author | Adam Goode <adam@spicenitz.org> | 2013-07-10 01:54:42 -0400 |
|---|---|---|
| committer | Adam Goode <adam@spicenitz.org> | 2013-07-10 01:54:42 -0400 |
| commit | 03e9b35658fdd249e7d0cf4f1f5f90cda4ec6d47 (patch) | |
| tree | 98c2b6c57ce446f67246d9ab354bd70a57b935cf | |
| parent | c9b9b2a47ce55a7f11899ed1003f199e1e1bc1a5 (diff) | |
| download | golang-03e9b35658fdd249e7d0cf4f1f5f90cda4ec6d47.tar.gz golang-03e9b35658fdd249e7d0cf4f1f5f90cda4ec6d47.tar.xz golang-03e9b35658fdd249e7d0cf4f1f5f90cda4ec6d47.zip | |
Try again to fix this package
| -rw-r--r-- | golang-prelink.conf | 3 | ||||
| -rw-r--r-- | golang.spec | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/golang-prelink.conf b/golang-prelink.conf new file mode 100644 index 0000000..471e8e6 --- /dev/null +++ b/golang-prelink.conf @@ -0,0 +1,3 @@ +# there are ELF files in src which are testdata and shouldn't be modified +-b /usr/lib/golang/src +-b /usr/lib64/golang/src diff --git a/golang.spec b/golang.spec index 2a4404e..339e6ae 100644 --- a/golang.spec +++ b/golang.spec @@ -12,9 +12,13 @@ # Do not check any files in doc or src for requires %global __requires_exclude_from ^(%{_datadir}|%{_libdir})/%{name}/(doc|src)/.*$ +# Don't alter timestamps of especially the .a files (or else go will rebuild later) +# Actually, don't strip at all since we are not even building debug packages and this corrupts the dwarf testdata +%global __strip /bin/true + Name: golang Version: 1.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Go Programming Language License: BSD @@ -36,6 +40,7 @@ Obsoletes: %{name}-data < 1.1.1-4 ExclusiveArch: %{ix86} x86_64 %{arm} Source100: golang-gdbinit +Source101: golang-prelink.conf %description %{summary}. @@ -200,6 +205,10 @@ cp -av misc/zsh/go $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang +# prelink blacklist +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d +cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf + %files %doc AUTHORS CONTRIBUTORS LICENSE PATENTS VERSION @@ -219,6 +228,9 @@ cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang # gdbinit (for gdb debugging) %{_sysconfdir}/gdbinit.d +# prelink blacklist +%{_sysconfdir}/prelink.conf.d + %files vim %doc AUTHORS CONTRIBUTORS LICENSE PATENTS @@ -238,6 +250,10 @@ cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang %changelog +* Wed Jul 10 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-5 +- Blacklist testdata files from prelink +- Again try to fix #973842 + * Fri Jul 5 2013 Adam Goode <adam@spicenitz.org> - 1.1.1-4 - Move src to libdir for now (#973842) (upstream issue https://code.google.com/p/go/issues/detail?id=5830) - Eliminate noarch data package to work around RPM bug (#975909) |