394a9f4f5d
Use ffmpeg (libavcodec, libavformat, libavutil), libevent, jsoncpp, and protobuf system libraries instead of the ones shipped with qtwebengine and chromium. Now armv6* builds succeed because the problematic vp8 is handled by the system ffmpeg package, where it is disabled for armv6* Fix leaking of CFLAGS and LDFLAGS into the installed mkspecs. This should fix building qt5-webkit for cross targets.
14 lines
715 B
Diff
14 lines
715 B
Diff
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/SpinLock.cpp 2017-01-03 10:28:53.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/SpinLock.cpp 2017-03-05 16:31:09.299623422 +0100
|
|
@@ -29,8 +29,10 @@
|
|
#elif COMPILER(GCC) || COMPILER(CLANG)
|
|
#if CPU(X86_64) || CPU(X86)
|
|
#define YIELD_PROCESSOR __asm__ __volatile__("pause")
|
|
-#elif CPU(ARM) || CPU(ARM64)
|
|
+#elif CPU(ARM64)
|
|
#define YIELD_PROCESSOR __asm__ __volatile__("yield")
|
|
+#elif CPU(ARM)
|
|
+#define YIELD_PROCESSOR __asm__ __volatile__("nop")
|
|
#elif CPU(MIPS)
|
|
// The MIPS32 docs state that the PAUSE instruction is a no-op on older
|
|
// architectures (first added in MIPS32r2). To avoid assembler errors when
|