<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Dec 6, 2017 at 5:17 AM, Otavio Salvador <span dir="ltr"><<a href="mailto:otavio@ossystems.com.br" target="_blank">otavio@ossystems.com.br</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This reverts commit d6fcf91c06a3d118e8741273fac690<wbr>3100141db4.<br>
<br>
This commit was included on the rocko update by mistake. It ended<br>
being dropped from master merge queue but forgotten in rocko one.<br></blockquote><div><br></div><div>Also causes a build failure on sd-600 [1] when linking containerd-docker (meta-virtualization) to libgcc due to pass -shared and -pie by default.</div><div><br></div><div>...</div><div><div>08:51:05 | cd ctr && go build -ldflags "-w -extldflags -static -X <a href="http://github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429">github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429</a> " -tags "" -o ../bin/ctr</div><div>08:51:05 | cd containerd && go build -ldflags "-w -extldflags -static -X <a href="http://github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429">github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429</a> " -tags "" -o ../bin/containerd</div><div>08:51:05 | cd containerd-shim && go build -ldflags "-w -extldflags -static -X <a href="http://github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429">github.com/containerd/containerd.GitCommit=3addd840653146c90a254301d6c3a663c7fd6429</a> " -tags "" -o ../bin/containerd-shim</div><div>08:51:05 | # <a href="http://github.com/containerd/containerd/containerd-shim">github.com/containerd/containerd/containerd-shim</a></div><div>08:51:05 | /srv/oe/build/tmp-rpb_wayland-glibc/work/armv7ahf-neon-linaro-linux-gnueabi/containerd-docker/v0.2.x+git3addd840653146c90a254301d6c3a663c7fd6429-r0/recipe-sysroot-native/usr/lib/arm-linaro-linux-gnueabi/go/pkg/tool/linux_amd64/link: running arm-linaro-linux-gnueabi-gcc failed: exit status 1</div><div>08:51:05 | /srv/oe/build/tmp-rpb_wayland-glibc/work/armv7ahf-neon-linaro-linux-gnueabi/containerd-docker/v0.2.x+git3addd840653146c90a254301d6c3a663c7fd6429-r0/recipe-sysroot-native/usr/bin/arm-linaro-linux-gnueabi/../../libexec/arm-linaro-linux-gnueabi/gcc/arm-linaro-linux-gnueabi/7.1.1/ld: /srv/oe/build/tmp-rpb_wayland-glibc/work/armv7ahf-neon-linaro-linux-gnueabi/containerd-docker/v0.2.x+git3addd840653146c90a254301d6c3a663c7fd6429-r0/recipe-sysroot/usr/lib/arm-linaro-linux-gnueabi/7.1.1/crtbeginT.o: relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC</div></div><div>...<div><div><br></div><div>[1] <a href="https://ci.linaro.org/job/lt-qcom-openembedded-rpb-rocko/6/DISTRO=rpb-wayland,MACHINE=sd-600eval,label=docker-stretch-amd64/console">https://ci.linaro.org/job/lt-qcom-openembedded-rpb-rocko/6/DISTRO=rpb-wayland,MACHINE=sd-600eval,label=docker-stretch-amd64/console</a><br></div></div></div><div><br></div><div>Cheers,</div><div>Anibal</div><div> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>><br>
---<br>
<br>
meta/recipes-devtools/go/go-1.<wbr>9.inc | 3 -<br>
.../go/go-1.9/default-<wbr>buildmode-pie.patch | 18 ----<br>
.../go/go-1.9/set-external-<wbr>linker.patch | 111 ---------------------<br>
3 files changed, 132 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/go/go-1.<wbr>9/default-buildmode-pie.patch<br>
delete mode 100644 meta/recipes-devtools/go/go-1.<wbr>9/set-external-linker.patch<br>
<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9.inc b/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
index f52abb5735..65adaa8d72 100644<br>
--- a/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
+++ b/meta/recipes-devtools/go/go-<wbr>1.9.inc<br>
@@ -15,9 +15,6 @@ SRC_URI += "\<br>
file://0007-ld-add-soname-to-<wbr>shareable-objects.patch \<br>
file://0008-make.bash-add-<wbr>GOHOSTxx-indirection-for-<wbr>cross-canadia.patch \<br>
file://0009-cmd-go-buildmode-<wbr>pie-forces-external-linking-<wbr>mode-on.patch \<br>
- file://default-buildmode-pie.<wbr>patch \<br>
"<br>
-SRC_URI_append_libc-musl = " file://set-external-linker.<wbr>patch"<br>
-<br>
SRC_URI[main.md5sum] = "<wbr>da2d44ea384076efec43ee1f8b7d45<wbr>d2"<br>
SRC_URI[main.sha256sum] = "<wbr>a4ab229028ed167ba1986825751463<wbr>605264e44868362ca8e7accc8be057<wbr>e993"<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch b/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch<br>
deleted file mode 100644<br>
index a7933bd39e..0000000000<br>
--- a/meta/recipes-devtools/go/go-<wbr>1.9/default-buildmode-pie.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,18 +0,0 @@<br>
-Default to PIE on linux platforms<br>
-<br>
-Upstream-Status: Pending<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-<br>
-diff -upr src/go.orig/src/cmd/go/<wbr>internal/work/build.go src/go/src/cmd/go/internal/<wbr>work/build.go<br>
---- go.orig/src/cmd/go/internal/<wbr>work/build.go 2017-08-27 17:38:26.354750979 +0200<br>
-+++ go/src/cmd/go/internal/work/<wbr>build.go 2017-08-27 17:40:27.555130105 +0200<br>
-@@ -304,7 +304,8 @@ func BuildModeInit() {<br>
- ldBuildmode = "c-shared"<br>
- case "default":<br>
- switch platform {<br>
-- case "android/arm", "android/arm64", "android/amd64", "android/386":<br>
-+ case "linux/386", "linux/amd64", "linux/arm", "linux/arm64", "linux/ppc64le", "linux/s390x",<br>
-+ "android/arm", "android/arm64", "android/amd64", "android/386":<br>
- codegenArg = "-shared"<br>
- ldBuildmode = "pie"<br>
- case "darwin/arm", "darwin/arm64":<br>
diff --git a/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch b/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch<br>
deleted file mode 100644<br>
index d6bd7fa39c..0000000000<br>
--- a/meta/recipes-devtools/go/go-<wbr>1.9/set-external-linker.patch<br>
+++ /dev/null<br>
@@ -1,111 +0,0 @@<br>
-Change the dynamic linker hardcoding to use musl when not using glibc<br>
-this should be applied conditional to musl being the system C library<br>
-<br>
-Upstream-Status: Inappropriate [Real Fix should be portable across libcs]<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-<br>
-Index: go/src/cmd/link/internal/<wbr>amd64/obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>amd64/obj.go<br>
-+++ go/src/cmd/link/internal/<wbr>amd64/obj.go<br>
-@@ -67,7 +67,7 @@ func Init() {<br>
- ld.Thearch.Append64 = ld.Append64l<br>
- ld.Thearch.TLSIEtoLE = tlsIEtoLE<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib64/ld-linux-x86-64.so.2"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-x86_64.so.1"<br>
- ld.Thearch.Freebsddynld = "/libexec/ld-elf.so.1"<br>
- ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
- ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"<br>
-Index: go/src/cmd/link/internal/arm/<wbr>obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>arm/obj.go<br>
-+++ go/src/cmd/link/internal/arm/<wbr>obj.go<br>
-@@ -63,7 +63,7 @@ func Init() {<br>
- ld.Thearch.Append32 = ld.Append32l<br>
- ld.Thearch.Append64 = ld.Append64l<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.3" // 2 for OABI, 3 for EABI<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-armhf.so.1"<br>
- ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"<br>
- ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
- ld.Thearch.Netbsddynld = "/libexec/ld.elf_so"<br>
-Index: go/src/cmd/link/internal/<wbr>arm64/obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>arm64/obj.go<br>
-+++ go/src/cmd/link/internal/<wbr>arm64/obj.go<br>
-@@ -62,7 +62,7 @@ func Init() {<br>
- ld.Thearch.Append32 = ld.Append32l<br>
- ld.Thearch.Append64 = ld.Append64l<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib/ld-linux-aarch64.so.1"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-aarch64.so.1"<br>
-<br>
- ld.Thearch.Freebsddynld = "XXX"<br>
- ld.Thearch.Openbsddynld = "XXX"<br>
-Index: go/src/cmd/link/internal/mips/<wbr>obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>mips/obj.go<br>
-+++ go/src/cmd/link/internal/mips/<wbr>obj.go<br>
-@@ -77,7 +77,7 @@ func Init() {<br>
- ld.Thearch.Append64 = ld.Append64b<br>
- }<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib/ld.so.1"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-mipsle.so.1"<br>
-<br>
- ld.Thearch.Freebsddynld = "XXX"<br>
- ld.Thearch.Openbsddynld = "XXX"<br>
-Index: go/src/cmd/link/internal/<wbr>mips64/obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>mips64/obj.go<br>
-+++ go/src/cmd/link/internal/<wbr>mips64/obj.go<br>
-@@ -75,7 +75,7 @@ func Init() {<br>
- ld.Thearch.Append64 = ld.Append64b<br>
- }<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
-+ ld.Thearch.Linuxdynld = "/lib64/ld-musl-mips64le.so.1"<br>
-<br>
- ld.Thearch.Freebsddynld = "XXX"<br>
- ld.Thearch.Openbsddynld = "XXX"<br>
-Index: go/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
-+++ go/src/cmd/link/internal/<wbr>ppc64/obj.go<br>
-@@ -77,7 +77,7 @@ func Init() {<br>
- }<br>
-<br>
- // TODO(austin): ABI v1 uses /usr/lib/ld.so.1<br>
-- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-powerpc64le.so.<wbr>1"<br>
-<br>
- ld.Thearch.Freebsddynld = "XXX"<br>
- ld.Thearch.Openbsddynld = "XXX"<br>
-Index: go/src/cmd/link/internal/<wbr>s390x/obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>s390x/obj.go<br>
-+++ go/src/cmd/link/internal/<wbr>s390x/obj.go<br>
-@@ -62,7 +62,7 @@ func Init() {<br>
- ld.Thearch.Append32 = ld.Append32b<br>
- ld.Thearch.Append64 = ld.Append64b<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib64/ld64.so.1"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-s390x.so.1"<br>
-<br>
- // not relevant for s390x<br>
- ld.Thearch.Freebsddynld = "XXX"<br>
-Index: go/src/cmd/link/internal/x86/<wbr>obj.go<br>
-=============================<wbr>==============================<wbr>========<br>
---- go.orig/src/cmd/link/internal/<wbr>x86/obj.go<br>
-+++ go/src/cmd/link/internal/x86/<wbr>obj.go<br>
-@@ -63,7 +63,7 @@ func Init() {<br>
- ld.Thearch.Append32 = ld.Append32l<br>
- ld.Thearch.Append64 = ld.Append64l<br>
-<br>
-- ld.Thearch.Linuxdynld = "/lib/ld-linux.so.2"<br>
-+ ld.Thearch.Linuxdynld = "/lib/ld-musl-i386.so.1"<br>
- ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1"<br>
- ld.Thearch.Openbsddynld = "/usr/libexec/ld.so"<br>
- ld.Thearch.Netbsddynld = "/usr/libexec/ld.elf_so"<br>
<span class="gmail-HOEnZb"><font color="#888888">--<br>
2.15.1<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br><br></div></div>