Skip to contentSkip to conversation

golang: use oe-meta-go

PATCH New Amy Fong 1 participant 1 message Jul 27, 2015

lore
Share & tools
lore

Amy Fong

author
#0 lore raw

PATCH 1/1 golang: use oe-meta-go

From b101a0c7ce6ef1eb41bef786831e58fa4d1b069f Mon Sep 17 00:00:00 2001
From: Amy Fong <[email protected]>
Date: Mon, 27 Jul 2015 14:10:20 -0400
Subject: [PATCH] golang: use oe-meta-go

Update meta-virtualization to use go package from oe-meta-go. The package golang-cross is go-cross in the oe-meta-go.

---
 README                                          |   1 +
 recipes-containers/docker/docker_git.bb         |   2 +-
 recipes-devtools/go/files/bsd_svid_source.patch |  37 ------
 recipes-devtools/go/files/ccache.patch          | 147 ------------------------
 recipes-devtools/go/golang-1.3.inc              |   4 -
 recipes-devtools/go/golang-cross.inc            |  61 ----------
 recipes-devtools/go/golang-cross_1.3.bb         |   4 -
 7 files changed, 2 insertions(+), 254 deletions(-)
 delete mode 100644 recipes-devtools/go/files/bsd_svid_source.patch
 delete mode 100644 recipes-devtools/go/files/ccache.patch
 delete mode 100644 recipes-devtools/go/golang-1.3.inc
 delete mode 100644 recipes-devtools/go/golang-cross.inc
 delete mode 100644 recipes-devtools/go/golang-cross_1.3.bb
README +1 -0
index ae5406d..beb3760 100644
@@ -20,6 +20,7 @@ layers: meta-oe
 	meta-networking
         meta-filesystems
         meta-python
+        oe-meta-go
 
 BBFILE_PRIORITY_openembedded-layer = "4"
 
recipes-containers/docker/docker_git.bb +1 -1
index ab32235..aa125a3 100644
@@ -36,7 +36,7 @@ S = "${WORKDIR}/git"
 DOCKER_VERSION = "1.6.2"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
-DEPENDS = "golang-cross \
+DEPENDS = "go-cross \
     go-cli \
     go-pty \
     go-context \
recipes-devtools/go/files/bsd_svid_source.patch deleted +0 -37
deleted file mode 100644
index 21e1d4c..0000000
@@ -1,37 +0,0 @@
-golang-cross: do_compile fails cc1: all warnings being treated as errors
-
-glibc 2.20 deprecates _BSD_SOURCE and _SVID_SOURCE and emits an error
-message.  From patch 16632:
-	libc [PATCH] BZ #16632: Disable _SVID_SOURCE/_BSD_SOURCE warning
-	if _DEFAULT_SOURCE is defined
-
-Since we also need to support glibc before 2.20, from the release notes
-for glibc 2.20, the recommended fix is to define _DEFAULT_SOURCE
-
-(fixed upstream)
-https://groups.google.com/forum/#!topic/golang-codereviews/S4TARFCxu2k
-
-Signed-off-by: Amy Fong <[email protected]>
----
- include/u.h |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/include/u.h
-+++ b/include/u.h
-@@ -38,6 +38,16 @@
- #		define __MAKECONTEXT_V2_SOURCE 1
- #	endif
- #endif
-+/**
-+ * in glibc >= 2.20, _BSD_SOURCE and _SVID_SOURCE causes warning
-+ * messages if _DEFAULT_SOURCE is not defined.
-+ *
-+ * From glibc 2.20 release notes, since this application needs _BSD_SOURCE
-+ * and/or _SVID_SOURCE and we must support glibc < 2.19 and
-+ * glibc >= 2.20, then define all 3 (_DEFAULT_SOURCE, _BSD_SOURCE,
-+ * and _SVID_SOURCE) unconditionally
-+ */
-+#define _DEFAULT_SOURCE 1
- #define _BSD_SOURCE 1
- #define _NETBSD_SOURCE 1	/* NetBSD */
- #define _SVID_SOURCE 1
recipes-devtools/go/files/ccache.patch deleted +0 -147

147 lines not on this page · raw message

recipes-devtools/go/golang-1.3.inc deleted +0 -4
deleted file mode 100644
index 5c507b4..0000000
@@ -1,4 +0,0 @@
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=591778525c869cdde0ab5a1bf283cd81"
-SRC_URI[md5sum] = "4b66d7249554181c314f139ea78920b1"
-SRC_URI[sha256sum] = "eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382"
recipes-devtools/go/golang-cross.inc deleted +0 -61

61 lines not on this page · raw message

recipes-devtools/go/golang-cross_1.3.bb deleted +0 -4
deleted file mode 100644
index fcb0e7a..0000000
@@ -1,4 +0,0 @@
-inherit cross
-
-require golang-cross.inc
-require golang-${PV}.inc
Signature · 1 line
2.1.4