From 4a49aae7d660bce408f61bb7f35ecc7a21011730 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 30 Nov 2020 08:24:29 +0100 Subject: wpewebkit: fix building on x86_64 and aarch64 Building libqtwpe.so with bmalloc currently fails on these architectures with: lib/../Source/bmalloc/CMakeFiles/bmalloc.dir/bmalloc/Heap.cpp.o: in function `bmalloc::Heap::usingGigacage()': Heap.cpp:(.text+0x24): undefined reference to `g_config' So use system malloc for now in this case for now. Signed-off-by: Michael Olbrich --- rules/wpewebkit.make | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index a95efb209..07e93049d 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -61,9 +61,20 @@ WPEWEBKIT_CONF_OPT := \ -DUSE_WOFF2=OFF \ -DWTF_CPU_ARM64_CORTEXA53=OFF +WPEWEBKIT_SYSTEM_MALLOC := OFF +ifdef PTXCONF_WPEWEBKIT_QT +ifdef PTXCONF_ARCH_ARM64 +WPEWEBKIT_SYSTEM_MALLOC := ON +endif +ifdef PTXCONF_ARCH_X86_64 +WPEWEBKIT_SYSTEM_MALLOC := ON +endif +endif + # private options WPEWEBKIT_CONF_OPT += \ - -DENABLE_REMOTE_INSPECTOR=ON + -DENABLE_REMOTE_INSPECTOR=ON \ + -DUSE_SYSTEM_MALLOC=$(WPEWEBKIT_SYSTEM_MALLOC) # ---------------------------------------------------------------------------- # Target-Install -- cgit v1.2.3