From 7aec19e8ba897c6465ba9630e1398a33f4302a67 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sun, 17 Mar 2019 22:13:57 +0100 Subject: [PATCH] webkit: fix build on i686/armv7l --- srcpkgs/webkit2gtk/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 711b7128459..293add9ab2c 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -45,15 +45,13 @@ build_options_default="wayland x11" desc_option_jit="Enable JustInTime JS support" desc_option_sampling_profiler="Toggle sampling profiler support (disabled on musl)" +# JIT conflicts with sampling_profiler case "$XBPS_TARGET_MACHINE" in + i686) build_options_default+=" gir" ;; i686-musl|x86_64-musl) build_options_default+=" gir jit" ;; - ppc*-musl) ;; - mips-musl) ;; - armv[56]*-musl) ;; + ppc*-musl|mips-musl|arm*-musl) ;; *-musl) build_options_default+=" jit" ;; - armv[56]*) build_options_default+=" gir sampling_profiler" ;; - mips*) build_options_default+=" gir sampling_profiler" ;; - ppc*) build_options_default+=" gir sampling_profiler" ;; + armv*|mips*|ppc*) build_options_default+=" gir" ;; *) build_options_default+=" gir jit sampling_profiler" ;; esac