[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1a41a31af9fb15aac14c829b10db6dc99ba40557
Author: Michael Stahl <mstahl at 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
    (cherry picked from commit 43532a0944b0ee4727ea2ae480e54687e41d9201)
    Reviewed-on: https://gerrit.libreoffice.org/30533
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ece2bd7..da99332 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2684,7 +2684,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),\
@@ -2700,6 +2699,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 \