Title: [286127] trunk/Tools/buildstream
- Revision
- 286127
- Author
- [email protected]
- Date
- 2021-11-23 00:54:06 -0800 (Tue, 23 Nov 2021)
Log Message
[Flatpak SDK] Add build recipe for libjxl, fix after r286057
https://bugs.webkit.org/show_bug.cgi?id=233326
Reviewed by Philippe Normand.
Fix the generated .pc files installed by libjxl, which wrongly include libhwy as a
requirement, even when it is used internally in the implementation only and linked
in statically. This solves a remaining issue that CMake would not be able to find
the library using pkg-config.
* elements/sdk/libjxl.bst: Edit installed .pc files to remove libhwy.
Modified Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (286126 => 286127)
--- trunk/Tools/buildstream/ChangeLog 2021-11-23 02:28:18 UTC (rev 286126)
+++ trunk/Tools/buildstream/ChangeLog 2021-11-23 08:54:06 UTC (rev 286127)
@@ -1,3 +1,17 @@
+2021-11-23 Adrian Perez de Castro <[email protected]>
+
+ [Flatpak SDK] Add build recipe for libjxl, fix after r286057
+ https://bugs.webkit.org/show_bug.cgi?id=233326
+
+ Reviewed by Philippe Normand.
+
+ Fix the generated .pc files installed by libjxl, which wrongly include libhwy as a
+ requirement, even when it is used internally in the implementation only and linked
+ in statically. This solves a remaining issue that CMake would not be able to find
+ the library using pkg-config.
+
+ * elements/sdk/libjxl.bst: Edit installed .pc files to remove libhwy.
+
2021-11-19 Adrian Perez de Castro <[email protected]>
[Flatpak SDK] Add build recipe for libjxl
Modified: trunk/Tools/buildstream/elements/sdk/libjxl.bst (286126 => 286127)
--- trunk/Tools/buildstream/elements/sdk/libjxl.bst 2021-11-23 02:28:18 UTC (rev 286126)
+++ trunk/Tools/buildstream/elements/sdk/libjxl.bst 2021-11-23 08:54:06 UTC (rev 286127)
@@ -31,6 +31,16 @@
-DJPEGXL_FORCE_SYSTEM_GTEST=ON \
-DJPEGXL_FORCE_SYSTEM_HWY=ON
+config:
+ # libhwy is used only internally and linked statically, yet the
+ # generated .pc files will wrongly list it as a requirement.
+ # Append a build command that edits the files to reflect reality.
+ build-commands:
+ (>):
+ - |
+ find '%{build-dir}' -name '*.pc' -print -execdir \
+ sed -i -e '/^Requires\.private:/s/libhwy[[:space:]]*//' '{}' ';'
+
sources:
- kind: tar
url: https://github.com/libjxl/libjxl/archive/refs/tags/v0.6.1.tar.gz
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
