[GTK][WPE] force libpsl build to use ICU in jhbuild

https://bugs.webkit.org/show_bug.cgi?id=194288

Patch by Olivier Blin <olivier.blin@softathome.com> on 2019-02-05
Reviewed by Philippe Normand.

In jhbuild, libpsl depends on ICU, but its configure script may decide to use libidn instead of ICU.
This can cause build failures if libidn is detected but libunistring is not available.

Make sure that ICU is used for runtime and builtin PSL data.

* gtk/jhbuild.modules:
* wpe/jhbuild.modules:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240987 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7f04341..92a0733 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2019-02-05  Olivier Blin  <olivier.blin@softathome.com>
+
+        [GTK][WPE] force libpsl build to use ICU in jhbuild
+        https://bugs.webkit.org/show_bug.cgi?id=194288
+
+        Reviewed by Philippe Normand.
+
+        In jhbuild, libpsl depends on ICU, but its configure script may decide to use libidn instead of ICU.
+        This can cause build failures if libidn is detected but libunistring is not available.
+
+        Make sure that ICU is used for runtime and builtin PSL data.
+
+        * gtk/jhbuild.modules:
+        * wpe/jhbuild.modules:
+
 2019-02-05  Aakash Jain  <aakash_jain@apple.com>
 
         [ews-app] Modified timestamp should be updated on updating data

diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index a40d75f..948cbf9 100644 (file)
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -229,7 +229,8 @@
             hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/>
   </meson>
 
-  <autotools id="libpsl">
+  <autotools id="libpsl"
+             autogenargs="--enable-runtime=libicu --enable-builtin=libicu">
     <branch module="rockdaboot/libpsl/releases/download/libpsl-${version}/libpsl-${version}.tar.gz"
             version="0.20.2"
             repo="github-tarball"

diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
index 820dcfb..a6e6ad9 100644 (file)
--- a/Tools/wpe/jhbuild.modules
+++ b/Tools/wpe/jhbuild.modules
@@ -90,7 +90,8 @@
             hash="sha256:bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"/>
   </meson>
 
-  <autotools id="libpsl">
+  <autotools id="libpsl"
+             autogenargs="--enable-runtime=libicu --enable-builtin=libicu">
     <dependencies>
       <dep package="icu"/>
     </dependencies>