summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-01-02 20:14:04 +0100
committerStephan Bergmann <sbergman@redhat.com>2022-01-02 22:29:03 +0100
commitf6e02294ce8d71a03c8e440e041094d2dd0a9834 (patch)
tree291e63d9fb1658d1212caf523ae143a347bc9b53 /RepositoryExternal.mk
parent4e7f3692c9eb42a00797025289782baa69a42cc7 (diff)
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 <sbergman@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk3
1 files changed, 1 insertions, 2 deletions
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