RepositoryExternal.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 43532a0944b0ee4727ea2ae480e54687e41d9201
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 3 15:58:08 2016 +0100
RepositoryExternal.mk: fix poppler linking on Ubuntu
need to link poppler static library *before* jpeg
Change-Id: I0fd2abc12c93432715a02a3a567349abda4f990b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b3fbeba..e4f592d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2771,7 +2771,6 @@ endef
else # !SYSTEM_POPPLER
define gb_LinkTarget__use_poppler
-$(call gb_LinkTarget_use_external,$(1),jpeg)
$(call gb_LinkTarget_use_external_project,$(1),poppler,full)
$(call gb_LinkTarget_set_include,$(1),\
@@ -2787,6 +2786,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call
gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT)
\
)
+$(call gb_LinkTarget_use_external,$(1),jpeg)
+
ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\
-lobjc \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
