Title: [240987] trunk/Tools
Revision
240987
Author
[email protected]
Date
2019-02-05 12:28:47 -0800 (Tue, 05 Feb 2019)

Log Message

[GTK][WPE] force libpsl build to use ICU in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=194288

Patch by Olivier Blin <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (240986 => 240987)


--- trunk/Tools/ChangeLog	2019-02-05 20:19:05 UTC (rev 240986)
+++ trunk/Tools/ChangeLog	2019-02-05 20:28:47 UTC (rev 240987)
@@ -1,3 +1,18 @@
+2019-02-05  Olivier Blin  <[email protected]>
+
+        [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  <[email protected]>
 
         [ews-app] Modified timestamp should be updated on updating data

Modified: trunk/Tools/gtk/jhbuild.modules (240986 => 240987)


--- trunk/Tools/gtk/jhbuild.modules	2019-02-05 20:19:05 UTC (rev 240986)
+++ trunk/Tools/gtk/jhbuild.modules	2019-02-05 20:28:47 UTC (rev 240987)
@@ -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"

Modified: trunk/Tools/wpe/jhbuild.modules (240986 => 240987)


--- trunk/Tools/wpe/jhbuild.modules	2019-02-05 20:19:05 UTC (rev 240986)
+++ trunk/Tools/wpe/jhbuild.modules	2019-02-05 20:28:47 UTC (rev 240987)
@@ -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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to