external/cairo/StaticLibrary_pixman.mk | 2 ++ external/fontconfig/StaticLibrary_fontconfig.mk | 2 ++ external/freetype/StaticLibrary_freetype.mk | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit 0954c8c6f86b943295cef8e62837c66f7499775e Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Apr 1 11:16:59 2025 +0300 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:34:55 2025 +0100 Add some missing gb_StaticLibrary_use_unpacked calls I had missed that such are needed, which explains why I had had to manually hand-hold the build of those externals. (These are built as static libraries, for now, only for CODA-W.) Change-Id: Ib19ed82e0ab443b7ddfab254ed5754efd013bdf1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194583 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/cairo/StaticLibrary_pixman.mk b/external/cairo/StaticLibrary_pixman.mk index 7b52c0dab0c1..0272892a408a 100644 --- a/external/cairo/StaticLibrary_pixman.mk +++ b/external/cairo/StaticLibrary_pixman.mk @@ -9,6 +9,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,pixman)) +$(eval $(call gb_StaticLibrary_use_unpacked,pixman,cairo)) + $(eval $(call gb_StaticLibrary_set_include,pixman,\ -I$(gb_UnpackedTarball_workdir)/pixman \ -I$(gb_UnpackedTarball_workdir)/pixman/pixman \ diff --git a/external/fontconfig/StaticLibrary_fontconfig.mk b/external/fontconfig/StaticLibrary_fontconfig.mk index 963e30a5b3cd..7ad137a7808f 100644 --- a/external/fontconfig/StaticLibrary_fontconfig.mk +++ b/external/fontconfig/StaticLibrary_fontconfig.mk @@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,fontconfig)) +$(eval $(call gb_StaticLibrary_use_unpacked,fontconfig,fontconfig)) + $(eval $(call gb_StaticLibrary_set_include,fontconfig,\ -I$(gb_UnpackedTarball_workdir)/fontconfig \ -I$(gb_UnpackedTarball_workdir)/freetype/include \ diff --git a/external/freetype/StaticLibrary_freetype.mk b/external/freetype/StaticLibrary_freetype.mk index c76f8613ef69..978a904d62ba 100644 --- a/external/freetype/StaticLibrary_freetype.mk +++ b/external/freetype/StaticLibrary_freetype.mk @@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,freetype)) +$(eval $(call gb_StaticLibrary_use_unpacked,freetype,freetype)) + $(eval $(call gb_StaticLibrary_set_include,freetype,\ -I$(gb_UnpackedTarball_workdir)/freetype/include \ $$(INCLUDE) \
