From 8f8b75c1b131c6b512b3c8a4dc77d22c2fe8ddd3 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Thu, 26 Mar 2020 13:08:12 -0700 Subject: [PATCH] devops(webkit): force JHBUILD on GTK/WPE for now (#1555) --- browser_patches/webkit/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/build.sh b/browser_patches/webkit/build.sh index 990ac1ef72..c596a75e95 100755 --- a/browser_patches/webkit/build.sh +++ b/browser_patches/webkit/build.sh @@ -7,16 +7,16 @@ cd "$(dirname $0)" build_gtk() { if ! [[ -d ./WebKitBuild/GTK/DependenciesGTK ]]; then - yes | WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs + yes | WEBKIT_JHBUILD=1 WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitgtk-libs fi - WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/build-webkit --gtk --release --touch-events MiniBrowser + WEBKIT_JHBUILD=1 WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/GTK ./Tools/Scripts/build-webkit --gtk --release --touch-events MiniBrowser } build_wpe() { if ! [[ -d ./WebKitBuild/WPE/DependenciesWPE ]]; then - yes | WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitwpe-libs + yes | WEBKIT_JHBUILD=1 WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE DEBIAN_FRONTEND=noninteractive ./Tools/Scripts/update-webkitwpe-libs fi - WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release --touch-events MiniBrowser + WEBKIT_JHBUILD=1 WEBKIT_OUTPUTDIR=$(pwd)/WebKitBuild/WPE ./Tools/Scripts/build-webkit --wpe --release --touch-events MiniBrowser } if [[ "$(uname)" == "Darwin" ]]; then