RepositoryExternal.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f6e02294ce8d71a03c8e440e041094d2dd0a9834
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Jan 2 20:14:04 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Jan 2 22:29:03 2022 +0100
Replace obsolete *_use_external_project for libjpeg-turbo
...which no longer is an ExternalProject but just a StaticLibrary since
1295f497e0cc7fc7cfcb66182496a4d29aa701b3 "upgrade libjpeg-turbo to 2.1.1".
(This caused e.g. a from-scratch `make Library_pdfium` to fail with
> [PRJ] libjpeg-turbo
> touch: cannot touch '.../workdir/ExternalProject/libjpeg-turbo.done': No
such file or directory
when workdir/ExternalProject/ happens not to exist yet.)
Change-Id: Id0f0e3b13cc7e9e556d9c8e7698d4dfa1bb01659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127874
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 709376b80034..e791935b2cda 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -419,7 +419,6 @@ gb_ExternalProject__use_libjpeg :=
else
define gb_LinkTarget__use_libjpeg
-$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \
$$(INCLUDE) \
@@ -429,7 +428,7 @@ $(call
gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo)
endef
define gb_ExternalProject__use_libjpeg
-$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo)
+$(call gb_ExternalProject_use_static_libraries,$(1),libjpeg-turbo)
endef
