diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-12-09 16:10:59 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-12-10 02:26:15 -0500 |
commit | 06dad20a32c81b6a8b6e93c99cda6f1133abddc6 (patch) | |
tree | 330233c2bf4c12dfa7d2bed28384ca1ede512b38 /recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch | |
parent | c31e46fce79f32a6692358105e15d77c652a9c9a (diff) | |
download | meta-virtualization-06dad20a32c81b6a8b6e93c99cda6f1133abddc6.tar.gz |
go: add back 1.12 version to avoid compilation failure
go 1.12 was removed from oe-core, but currently k8s cannot
be built successfully with go 1.13. See link below.
https://github.com/kubernetes/kubernetes/issues/82531
We need to wait for k8s to support go 1.13 and update it
to latest release, as well as its depedencies. Before this
is done, add back go 1.12 and use it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch')
-rw-r--r-- | recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch b/recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch new file mode 100644 index 00000000..004a33a0 --- /dev/null +++ b/recipes-containers/kubernetes/go-1.12/0004-ld-add-soname-to-shareable-objects.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 55eb8c95a89f32aec16b7764e78e8cf75169dc81 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Madison <matt@madison.systems> | ||
3 | Date: Sat, 17 Feb 2018 06:26:10 -0800 | ||
4 | Subject: [PATCH] ld: add soname to shareable objects | ||
5 | |||
6 | so that OE's shared library dependency handling | ||
7 | can find them. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | |||
11 | Signed-off-by: Matt Madison <matt@madison.systems> | ||
12 | |||
13 | --- | ||
14 | src/cmd/link/internal/ld/lib.go | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go | ||
18 | index 220aab3..703925f 100644 | ||
19 | --- a/src/cmd/link/internal/ld/lib.go | ||
20 | +++ b/src/cmd/link/internal/ld/lib.go | ||
21 | @@ -1135,6 +1135,7 @@ func (ctxt *Link) hostlink() { | ||
22 | argv = append(argv, "-Wl,-z,relro") | ||
23 | } | ||
24 | argv = append(argv, "-shared") | ||
25 | + argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) | ||
26 | if ctxt.HeadType != objabi.Hwindows { | ||
27 | // Pass -z nodelete to mark the shared library as | ||
28 | // non-closeable: a dlclose will do nothing. | ||
29 | @@ -1146,6 +1147,8 @@ func (ctxt *Link) hostlink() { | ||
30 | argv = append(argv, "-Wl,-z,relro") | ||
31 | } | ||
32 | argv = append(argv, "-shared") | ||
33 | + argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) | ||
34 | + | ||
35 | case BuildModePlugin: | ||
36 | if ctxt.HeadType == objabi.Hdarwin { | ||
37 | argv = append(argv, "-dynamiclib") | ||
38 | @@ -1154,6 +1157,7 @@ func (ctxt *Link) hostlink() { | ||
39 | argv = append(argv, "-Wl,-z,relro") | ||
40 | } | ||
41 | argv = append(argv, "-shared") | ||
42 | + argv = append(argv, fmt.Sprintf("-Wl,-soname,%s", filepath.Base(*flagOutfile))) | ||
43 | } | ||
44 | } | ||
45 | |||