From c7c1bdafb9683e787b518d5b6d5233f4830351f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 1 May 2019 21:07:50 +0200 Subject: [PATCH] webkit2gtk: build for arm*-musl w/o gir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The builders (and also a local build) hang for hours when running g-ir-scanner-qemuwrapper. Until the underlying problem is solved enable arm*-musl without gir again. Signed-off-by: Jürgen Buchmüller --- srcpkgs/webkit2gtk/template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 628f0c5f33c..87d0522d5ff 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -34,22 +34,24 @@ nodebug=1 CXXFLAGS="-Wno-expansion-to-defined" -case "$XBPS_TARGET_MACHINE" in - arm*-musl) - # builders time out while or after linking WebKitPluginProcess2 - broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/18501/steps/shell_3/logs/stdio" - ;; - aarch64*|arm*) configure_args+=" -DUSE_LD_GOLD=0";; - i686*) CXXFLAGS+="-O2 -msse2";; -esac - # Package build options build_options="gir wayland x11 jit sampling_profiler" -build_options_default="gir wayland x11" +build_options_default="wayland x11" + +case "$XBPS_TARGET_MACHINE" in + arm*-musl) # cross building hangs for hours in g-ir-scanner-qemuwrapper + ;; + *) build_options_default+=" gir" +esac desc_option_jit="Enable JustInTime JS support" desc_option_sampling_profiler="Toggle sampling profiler support (disabled on musl)" +case "$XBPS_TARGET_MACHINE" in + aarch64*|arm*) configure_args+=" -DUSE_LD_GOLD=0";; + i686*) CXXFLAGS+="-O2 -msse2";; +esac + # JIT conflicts with sampling_profiler case "$XBPS_TARGET_MACHINE" in i686|ppc*|mips*|arm*) ;;