diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-20 16:07:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-30 11:06:48 +0200 |
| commit | 1295f497e0cc7fc7cfcb66182496a4d29aa701b3 (patch) | |
| tree | 3deacf9ec953301037f1c21aa9b756f5ca1fb332 /RepositoryExternal.mk | |
| parent | 45de43ce9f1441735817fa82924ddc4508d221cd (diff) | |
upgrade libjpeg-turbo to 2.1.1
simd enabled for x86_64 and x86, arm/aarch64 might be worth exploring
too
Change-Id: Ic2726ee8c6b6e59ca983b977ee2731f5b78b97d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123898
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 951267d0e624..23d4b2e63637 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -402,6 +402,10 @@ endif # SYSTEM_ZLIB ifneq ($(SYSTEM_LIBJPEG),) define gb_LinkTarget__use_libjpeg +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBJPEG_CFLAGS) \ +) $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ @@ -414,12 +418,12 @@ 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),\ - $(LIBJPEG_CFLAGS) \ + -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) -$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) +$(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo) endef |