diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-11-30 08:24:29 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-11-30 08:27:06 +0100 |
| commit | 4a49aae7d660bce408f61bb7f35ecc7a21011730 (patch) | |
| tree | aa74763dbae93410010663cc7369c013eae60137 | |
| parent | 44f7b3f12003bf877bc194b2934e284897e04175 (diff) | |
| download | ptxdist-4a49aae7d660bce408f61bb7f35ecc7a21011730.tar.gz ptxdist-4a49aae7d660bce408f61bb7f35ecc7a21011730.tar.xz | |
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 <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/wpewebkit.make | 13 |
1 files changed, 12 insertions, 1 deletions
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 |