summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-11-03 13:14:42 +0100
committerTor Lillqvist <tml@collabora.com>2016-11-13 11:02:07 +0200
commitd411e18d51bc381261427a65daac8c5c0108c6bf (patch)
tree5e2a0b74a523daf5f1e70c31de2af41ec89cee40
parent7d8e9a627e4f59acb0c7ab3212c02a6d4e78adb7 (diff)
Fix external libjpeg build
(cherry picked from commit f144d319d58cbb0d358250540cd666d9644f5fa5) RepositoryExternal.mk: really fix jpeg build (cherry picked from commit 8d1c80e2633b8a63050cdd81b7e089f27b996c0f) Change-Id: I1969db554d156e6af0975d03013ea4f7c10d839f Reviewed-on: https://gerrit.libreoffice.org/30527 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--RepositoryExternal.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 27dacdd23448..d995a835d8bc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -462,13 +462,13 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
jpeg \
)
+endef
+
define gb_ExternalProject__use_jpeg
$(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
endef
-endef
-
endif # SYSTEM_JPEG
ifneq ($(SYSTEM_MYTHES),)