diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-12-20 00:47:01 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-22 08:46:36 +0000 |
| commit | 8a024cb82b1718be51bd3a625364539ba50ae4ae (patch) | |
| tree | 1ac47a7521a678360d7bba2eb03808e862d539a8 /meta | |
| parent | e97b75ff0838fb3eb044adae1ffa5d28acb90eed (diff) | |
| download | openembedded-core-8a024cb82b1718be51bd3a625364539ba50ae4ae.tar.gz openembedded-core-8a024cb82b1718be51bd3a625364539ba50ae4ae.tar.bz2 openembedded-core-8a024cb82b1718be51bd3a625364539ba50ae4ae.zip | |
gstreamer1.0-libav: Fix build on mips64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch new file mode 100644 index 0000000000..7a0b448888 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch @@ -0,0 +1,32 @@ +It will add -mips64r6 and -mips64r2 to cmdline which will +cause conflicts + +in OE we user mips32r2 and mips64r2 for mips arch versions +so there is no benefit of detecting it automatically by +poking at tools especially in cross env + +Fixes errors like + +linking -mnan=2008 module with previous -mnan=legacy modules +failed to merge target specific data of file + +-Khem +Upstream-Status: Inappropriate [OE-Specific] + +Index: gst-libav-1.10.1/gst-libs/ext/libav/configure +=================================================================== +--- gst-libav-1.10.1.orig/gst-libs/ext/libav/configure ++++ gst-libav-1.10.1/gst-libs/ext/libav/configure +@@ -5269,12 +5269,9 @@ elif enabled mips; then + + # Enable minimum ISA based on selected options + if enabled mips64; then +- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6' + enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2' + disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64' + else +- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6' +- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5' + enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2' + disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32' + fi diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb index 98f5a50a9a..d44a5b24cb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.10.1.bb @@ -12,6 +12,7 @@ SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ + file://mips64_cpu_detection.patch \ " SRC_URI[md5sum] = "9dc8fb8dd01818c27230a1ed6ba9f4de" SRC_URI[sha256sum] = "27b28b8de0e6dff1e3952428e8ed8ba4a12f452f789ac0ae9bbe50f00a5c72c7" |