external/zlib/StaticLibrary_zlib.mk | 2 ++ external/zlib/UnpackedTarball_zlib.mk | 5 +++++ 2 files changed, 7 insertions(+)
New commits: commit 5763df08a48337d6723838047393ad8e1e93dbf1 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Sep 25 11:22:35 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Sep 25 20:56:21 2025 +0200 create dummy pkgconfig file for internal zlib Change-Id: Ie1c0a62779fe72afdcad7aa29b1eb2898ab75825 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191503 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk index 6463ffc531fd..504575cdefcc 100644 --- a/external/zlib/StaticLibrary_zlib.mk +++ b/external/zlib/StaticLibrary_zlib.mk @@ -30,6 +30,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\ UnpackedTarball/zlib/zutil \ )) +$(call gb_StaticLibrary_get_target,zlib): $(gb_UnpackedTarball_workdir)/zlib/zlib-uninstalled.pc + ifeq ($(ENABLE_DEBUG),TRUE) $(eval $(call gb_StaticLibrary_add_cflags,zlib,-DZLIB_DEBUG)) endif diff --git a/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk index 5149063f456d..5bad9e311233 100644 --- a/external/zlib/UnpackedTarball_zlib.mk +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -22,4 +22,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,zlib, \ external/zlib/missinginclude.patch \ )) +# cannot use post_action since $(file ..) would be run when the recipe is parsed, i.e. would always +# happen before the tarball is unpacked +$(gb_UnpackedTarball_workdir)/zlib/zlib-uninstalled.pc: $(call gb_UnpackedTarball_get_target,zlib) + $(file >$@,$(call gb_pkgconfig_file,zlib,1.3.1,$(ZLIB_CFLAGS),$(ZLIB_LIBS))) + # vim: set noet sw=4 ts=4:
