From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Perez de Castro Date: Tue, 20 Oct 2020 18:43:20 +0300 Subject: [Buildroot] [PATCH 1/2] package/wpewebkit: fix build with ENABLE_C_LOOP=ON In-Reply-To: <20201020154321.3491904-1-aperez@igalia.com> References: <20201020154321.3491904-1-aperez@igalia.com> Message-ID: <20201020154321.3491904-2-aperez@igalia.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net The ENABLE_C_LOOP option conflicts with ENABLE_SAMPLING_PROFILER, so the WebKit CMake build system will emit an error when both are enabled at the same time. To avoid hitting that situation, explicitly disable ENABLE_SAMPLING_PROFILER as needed. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index d6a3dca551..7bb13aa610 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -67,9 +67,12 @@ endif # have a check for these processors. Disable JIT forcibly here and use # the CLoop interpreter instead. # +# Also, we have to disable the sampling profiler, which does NOT work +# with ENABLE_C_LOOP. +# # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif $(eval $(cmake-package)) -- 2.28.0