Merge branch 'master' into el6
* master: fix BSD/SVID patch, and fix up changelog entry (rpmlint was complaining about invalid date) update hostname patch fix patchlevel for patch200 re-order some patches, remove unneeded glibc deprecated macros _BSD_SOURCE and _SVID_SOURCE
This commit is contained in:
commit
3fb2038602
|
@ -0,0 +1,31 @@
|
||||||
|
--- include/u.h.orig 2014-02-20 13:51:53.456000000 -0600
|
||||||
|
+++ include/u.h 2014-02-20 13:55:51.072000000 -0600
|
||||||
|
@@ -38,9 +38,12 @@
|
||||||
|
# define __MAKECONTEXT_V2_SOURCE 1
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
+#if defined __linux__ || defined __GNU__ || defined __GLIBC__
|
||||||
|
+#define _DEFAULT_SOURCE 1
|
||||||
|
+#else
|
||||||
|
#define _BSD_SOURCE 1
|
||||||
|
-#define _NETBSD_SOURCE 1 /* NetBSD */
|
||||||
|
#define _SVID_SOURCE 1
|
||||||
|
+#endif
|
||||||
|
#if !defined(__APPLE__) && !defined(__OpenBSD__)
|
||||||
|
# define _XOPEN_SOURCE 1000
|
||||||
|
# define _XOPEN_SOURCE_EXTENDED 1
|
||||||
|
--- src/lib9/utf/utfecpy.c.orig 2014-02-20 14:12:27.735000000 -0600
|
||||||
|
+++ src/lib9/utf/utfecpy.c 2014-02-20 14:13:09.242000000 -0600
|
||||||
|
@@ -11,7 +11,11 @@
|
||||||
|
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
|
||||||
|
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
|
||||||
|
*/
|
||||||
|
-#define _BSD_SOURCE 1
|
||||||
|
+#if defined __linux__ || defined __GNU__ || defined __GLIBC__
|
||||||
|
+#define _DEFAULT_SOURCE 1
|
||||||
|
+#else
|
||||||
|
+ #define _BSD_SOURCE 1
|
||||||
|
+#endif
|
||||||
|
#include <string.h>
|
||||||
|
#include "utf.h"
|
||||||
|
#include "utfdef.h"
|
|
@ -1,11 +1,9 @@
|
||||||
Index: go/src/pkg/os/os_test.go
|
--- src/pkg/os/os_test.go.orig 2014-02-20 13:14:45.543644182 -0600
|
||||||
===================================================================
|
+++ src/pkg/os/os_test.go 2014-02-20 13:14:55.934813622 -0600
|
||||||
--- go.orig/src/pkg/os/os_test.go
|
@@ -854,7 +854,7 @@
|
||||||
+++ go/src/pkg/os/os_test.go
|
|
||||||
@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
defer r.Close()
|
||||||
- p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
|
- p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
|
||||||
+ p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
|
+ p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
31
golang.spec
31
golang.spec
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
Name: golang
|
Name: golang
|
||||||
Version: 1.2
|
Version: 1.2
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: The Go Programming Language
|
Summary: The Go Programming Language
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
|
@ -35,7 +35,11 @@ Source0: https://go.googlecode.com/files/go%{version}.src.tar.gz
|
||||||
# this command moved places
|
# this command moved places
|
||||||
%if 0%{?fedora} >= 21
|
%if 0%{?fedora} >= 21
|
||||||
BuildRequires: /usr/bin/hostname
|
BuildRequires: /usr/bin/hostname
|
||||||
Patch1: golang-f21-hostname.patch
|
Patch210: golang-f21-hostname.patch
|
||||||
|
|
||||||
|
# Patch211 - F21+ has glibc 2.19.90 (2.20 devel)+ which deprecates
|
||||||
|
# _BSD_SOURCE and _SVID_SOURCE
|
||||||
|
Patch211: golang-1.2-BSD-SVID-SOURCE.patch
|
||||||
%else
|
%else
|
||||||
BuildRequires: /bin/hostname
|
BuildRequires: /bin/hostname
|
||||||
%endif
|
%endif
|
||||||
|
@ -55,16 +59,16 @@ Requires: glibc
|
||||||
Patch0: golang-1.2-verbose-build.patch
|
Patch0: golang-1.2-verbose-build.patch
|
||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1038683
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1038683
|
||||||
Patch2: golang-1.2-remove-ECC-p224.patch
|
Patch1: golang-1.2-remove-ECC-p224.patch
|
||||||
|
|
||||||
# disable flaky test for now
|
# disable flaky test for now
|
||||||
# http://code.google.com/p/go/issues/detail?id=6522
|
# http://code.google.com/p/go/issues/detail?id=6522
|
||||||
Patch3: ./golang-1.2-skipCpuProfileTest.patch
|
Patch2: ./golang-1.2-skipCpuProfileTest.patch
|
||||||
|
|
||||||
# Pull in new archive/tar upstream patch to support xattrs for
|
# Pull in new archive/tar upstream patch to support xattrs for
|
||||||
# docker-0.8.1
|
# docker-0.8.1
|
||||||
# https://code.google.com/p/go/source/detail?r=a15f344a9efa
|
# https://code.google.com/p/go/source/detail?r=a15f344a9efa
|
||||||
Patch4: golang-1.2-archive_tar-xattr.patch
|
Patch3: golang-1.2-archive_tar-xattr.patch
|
||||||
|
|
||||||
# Having documentation separate was broken
|
# Having documentation separate was broken
|
||||||
Obsoletes: %{name}-docs < 1.1-4
|
Obsoletes: %{name}-docs < 1.1-4
|
||||||
|
@ -146,17 +150,22 @@ end
|
||||||
|
|
||||||
cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar
|
cp %SOURCE400 src/pkg/archive/tar/testdata/xattrs.tar
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 21
|
||||||
|
%patch210 -p0
|
||||||
|
%patch211 -p0
|
||||||
|
%endif
|
||||||
|
|
||||||
# increase verbosity of build
|
# increase verbosity of build
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
|
||||||
# remove the P224 curve
|
# remove the P224 curve
|
||||||
%patch2 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
# skip flaky test
|
# skip flaky test
|
||||||
%patch3 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
# new archive/tar implementation from upstream
|
# new archive/tar implementation from upstream
|
||||||
%patch4 -p1
|
%patch3 -p1
|
||||||
|
|
||||||
# create a [dirty] gcc wrapper to allow us to build with our own flags
|
# create a [dirty] gcc wrapper to allow us to build with our own flags
|
||||||
# (dirty because it is spoofing 'gcc' since CC value is stored in the go tool)
|
# (dirty because it is spoofing 'gcc' since CC value is stored in the go tool)
|
||||||
|
@ -309,6 +318,10 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 20 2014 Adam Miller <maxamillion@fedoraproejct.org> 1.2-7
|
||||||
|
- Remove _BSD_SOURCE and _SVID_SOURCE, they are deprecated in recent
|
||||||
|
versions of glibc and aren't needed
|
||||||
|
|
||||||
* Wed Feb 19 2014 Adam Miller <maxamillion@fedoraproject.org> 1.2-6
|
* Wed Feb 19 2014 Adam Miller <maxamillion@fedoraproject.org> 1.2-6
|
||||||
- pull in upstream archive/tar implementation that supports xattr for
|
- pull in upstream archive/tar implementation that supports xattr for
|
||||||
docker 0.8.1
|
docker 0.8.1
|
||||||
|
@ -316,7 +329,7 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
|
||||||
* Tue Feb 18 2014 Vincent Batts <vbatts@redhat.com> 1.2-5
|
* Tue Feb 18 2014 Vincent Batts <vbatts@redhat.com> 1.2-5
|
||||||
- provide 'go', so users can yum install 'go'
|
- provide 'go', so users can yum install 'go'
|
||||||
|
|
||||||
* Thu Jan 24 2014 Vincent Batts <vbatts@redhat.com> 1.2-4
|
* Fri Jan 24 2014 Vincent Batts <vbatts@redhat.com> 1.2-4
|
||||||
- skip a flaky test that is sporadically failing on the build server
|
- skip a flaky test that is sporadically failing on the build server
|
||||||
|
|
||||||
* Thu Jan 16 2014 Vincent Batts <vbatts@redhat.com> 1.2-3
|
* Thu Jan 16 2014 Vincent Batts <vbatts@redhat.com> 1.2-3
|
||||||
|
|
Loading…
Reference in New Issue