gstreamer1.0-libav: Fix build on mips
PATCH 1/2 gstreamer1.0-libav: Fix build on mips
--- ...a.c-Fix-build-by-Including-libavcodec-hev.patch | 33 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-libav_1.12.2.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch new file +33 -0
@@ -0,0 +1,33 @@ +From b5226c096a0b7049874858e94a59d43e10ba3fd2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 21 Sep 2017 10:22:56 -0700 +Subject: [PATCH] hevcpred_msa.c: Fix build by Including libavcodec/hevcdec.h + +src/libavcodec/mips/hevcpred_msa.c:1913:32: error: unknown type name 'HEVCContext'; did you mean 'HEVCPredContext'? + void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx) + ^~~~~~~~~~~ + HEVCPredContext + +Signed-off-by: Khem Raj <[email protected]> +--- +Upstream-Status: Pending + + gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c +index 6a3b281..963c64c 100644 +--- a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c ++++ b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c +@@ -18,7 +18,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "libavcodec/hevc.h" ++#include "libavcodec/hevcdec.h" + #include "libavutil/mips/generic_macros_msa.h" + #include "hevcpred_mips.h" + +-- +2.14.1 +
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.2.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ file://mips64_cpu_detection.patch \ file://0001-configure-check-for-armv7ve-variant.patch \ + file://0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch \ " SRC_URI[md5sum] = "8788aecc032a287227b4bd239d1b998a" SRC_URI[sha256sum] = "5bb735b9bb218b652ae4071ea6f6be8eaae55e9d3233aec2f36b882a27542db3"
Signature · 1 line
2.14.1
PATCH 2/2 go: Remove mips32r2 from march to get cgo working
on mips, cgo used mips32r1 and that conflicts with mips32r2 lets remove it for now and work go upstream to make it work for golang as well
Fixes
| # runtime/cgo
| cc1: error: '-mips32r2' conflicts with the other architecture options, which specify a mips32 processor
Fixes [YOCTO #12108]
--- meta/recipes-devtools/go/go-common.inc | 4 ++++ meta/recipes-devtools/go/go_1.9.bb | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/go/go-common.inc +4 -0
@@ -20,3 +20,7 @@ B = "${S}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" SSTATE_SCAN_CMD = "true" + +TUNE_CCARGS_remove = "-march=mips32r2" +SECURITY_CFLAGS = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS = ""
meta/recipes-devtools/go/go_1.9.bb +0 -2
@@ -1,4 +1,2 @@ require go-${PV}.inc require go-target.inc -TUNE_CCARGS_remove = "-march=mips32r2" -SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"
Signature · 1 line
2.14.1
Re: [PATCH 2/2] go: Remove mips32r2 from march to get cgo working
Quoted 9 lines · Khem Raj
on mips, cgo used mips32r1 and that conflicts with mips32r2 lets remove it for now and work go upstream to make it work for golang as well
Fixes
Quoted 4 lines
# runtime/cgo cc1: error: '-mips32r2' conflicts with the other architecture options, which specify a mips32 processor
Quoted 7 lines
Fixes [YOCTO #12108]
Signed-off-by Khem Raj <[email protected]>---
meta/recipes-devtools/go/go-common.inc | 4 ++++
meta/recipes-devtools/go/go_1.9.bb | 2 --2 files changed, 4 insertions(+), 2 deletions(-)
I think this causes:
https://autobuilder.yocto.io/builders/nightly-world-lsb/builds/486/steps/BuildImages/logs/stdio
| # /tmp/go-build282041009/libstd.so | /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/i586-poky-linux/go-runtime/1.9-r0/go/pkg/tool/linux_amd64/link: running i586-poky-linux-gcc failed: exit status 1 | /tmp/go-link-130351246/go.o:(.data.rel.ro+0x36bfcc): undefined reference to `main.init' | /tmp/go-link-130351246/go.o:(.data.rel.ro+0x36bfd0): undefined reference to `main.main' | collect2: error: ld returned 1 exit status | | WARNING: exit code 2 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/i586-poky-linux/go-runtime/1.9-r0/temp/log.do_compile.29509)
NOTE: recipe go-runtime-1.9-r0: task do_compile: Failed
ERROR: Task (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/meta/recipes-devtools/go/go-runtime_1.9.bb:do_compile) failed with exit code '1'
Cheers,
Richard
Re: [PATCH 2/2] go: Remove mips32r2 from march to get cgo working
In reply to Khem RajQuoted 3 lines · Khem Raj
on mips, cgo used mips32r1 and that conflicts with mips32r2 lets remove it for now and work go upstream to make it work for golang as well
There is already someone working on expanding MIPS support for go, based on some mailing list discussions I've seen. Doesn't look like the changes have made it in yet, but looked like they could for 1.10.
Quoted 18 lines
Fixes
| # runtime/cgo
| cc1: error: '-mips32r2' conflicts with the other architecture options, which specify a mips32 processorFixes [YOCTO #12108]
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-devtools/go/go-common.inc | 4 ++++ meta/recipes-devtools/go/go_1.9.bb | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-)meta/recipes-devtools/go/go-common.inc +0
-0
meta/recipes-devtools/go/go-common.inc B = "${S}" · line 24
Quoted 5 lines
meta/recipes-devtools/go/go-common.inc +2
-0@@ -20,3 +20,7 @@ B = "${S}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" SSTATE_SCAN_CMD = "true" + +TUNE_CCARGS_remove = "-march=mips32r2"
The rework for this should probably go into goarch.bblcass, so it applies to go packages as well as the toolchain. The mips checks in goarch.bbclass need some refinement anyway, since Go only supports o32 ABI and hard-float. I can send along a patch that should cover what's needed.
-Matt
Quoted 20 lines
meta/recipes-devtools/go/go-common.inc +2
-0+SECURITY_CFLAGS = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS = ""meta/recipes-devtools/go/go_1.9.bb +0
-3@@ -1,4 +1,2 @@ require go-${PV}.inc require go-target.inc -TUNE_CCARGS_remove = "-march=mips32r2" -SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" --2.14.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core