diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-01-02 20:14:04 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-26 23:08:43 +0200 |
| commit | cd38da637c11e74ca0c9784b0d083a17f4af18f0 (patch) | |
| tree | 69c159e4632ae11c7609a5f1be3adb85387923b4 | |
| parent | becab1a7acd959e8fe3fcd9702bd68cb97ee263b (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>
| -rw-r--r-- | RepositoryExternal.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 414c4bba741d..64d8d1ac1aa7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -418,7 +418,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) \ @@ -428,7 +427,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 |