Changeset 286127 in webkit

Timestamp:

Nov 23, 2021, 12:54:06 AM (5 years ago)

Author:

Adrian Perez de Castro

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.

Location:

trunk/Tools/buildstream

Files:

• ChangeLog (modified) (1 diff)
• elements/sdk/libjxl.bst (modified) (1 diff)

trunk/Tools/buildstream/ChangeLog

@@ +1 @@
+2021-11-23  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [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  <aperez@igalia.com>
 

trunk/Tools/buildstream/elements/sdk/libjxl.bst

@@ -32 +32 @@
     -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