external/cairo/Library_cairo.mk | 10 +++++----- external/cairo/StaticLibrary_pixman.mk | 4 ++-- external/fontconfig/StaticLibrary_fontconfig.mk | 6 +++--- external/freetype/StaticLibrary_freetype.mk | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 00f89300c903028435ae678a29f6a15ac92e0086 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 10 16:01:40 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:32:47 2025 +0100 Use gb_UnpackedTarball_workdir Change-Id: I4ce3c487425191bba4f004e8a93fb81d7316c700 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194574 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/external/cairo/Library_cairo.mk b/external/cairo/Library_cairo.mk index 2aea585a44a3..732162c44b95 100644 --- a/external/cairo/Library_cairo.mk +++ b/external/cairo/Library_cairo.mk @@ -10,11 +10,11 @@ $(eval $(call gb_Library_Library,cairo)) $(eval $(call gb_Library_set_include,cairo,\ - -I$(call gb_UnpackedTarball_get_dir,cairo) \ - -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ - -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \ - -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ - -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ + -I$(gb_UnpackedTarball_workdir)/cairo \ + -I$(gb_UnpackedTarball_workdir)/cairo/src \ + -I$(gb_UnpackedTarball_workdir)/pixman/pixman \ + -I$(gb_UnpackedTarball_workdir)/freetype/include \ + -I$(gb_UnpackedTarball_workdir)/fontconfig \ $$(INCLUDE) \ )) diff --git a/external/cairo/StaticLibrary_pixman.mk b/external/cairo/StaticLibrary_pixman.mk index b4c83ca70ef8..7b52c0dab0c1 100644 --- a/external/cairo/StaticLibrary_pixman.mk +++ b/external/cairo/StaticLibrary_pixman.mk @@ -10,8 +10,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,pixman)) $(eval $(call gb_StaticLibrary_set_include,pixman,\ - -I$(call gb_UnpackedTarball_get_dir,pixman) \ - -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \ + -I$(gb_UnpackedTarball_workdir)/pixman \ + -I$(gb_UnpackedTarball_workdir)/pixman/pixman \ $$(INCLUDE) \ )) diff --git a/external/fontconfig/StaticLibrary_fontconfig.mk b/external/fontconfig/StaticLibrary_fontconfig.mk index 96ece049bd9c..b8fa09f3c79f 100644 --- a/external/fontconfig/StaticLibrary_fontconfig.mk +++ b/external/fontconfig/StaticLibrary_fontconfig.mk @@ -12,9 +12,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,fontconfig)) $(eval $(call gb_StaticLibrary_set_include,fontconfig,\ - -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ - -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ - -I$(call gb_UnpackedTarball_get_dir,expat)/lib \ + -I$(gb_UnpackedTarball_workdir)/fontconfig \ + -I$(gb_UnpackedTarball_workdir)/freetype/include \ + -I$(gb_UnpackedTarball_workdir)/expat/lib \ $$(INCLUDE) \ )) diff --git a/external/freetype/StaticLibrary_freetype.mk b/external/freetype/StaticLibrary_freetype.mk index 086237fa4a28..9e3413959ce5 100644 --- a/external/freetype/StaticLibrary_freetype.mk +++ b/external/freetype/StaticLibrary_freetype.mk @@ -12,7 +12,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,freetype)) $(eval $(call gb_StaticLibrary_set_include,freetype,\ - -I$(call gb_UnpackedTarball_get_dir,freetype)/include \ + -I$(gb_UnpackedTarball_workdir)/freetype/include \ $$(INCLUDE) \ ))
