[Libreoffice-commits] core.git: RepositoryExternal.mk

[Caolán McNamara]

 RepositoryExternal.mk |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 87114367d74526e738f8726e2567be5a0cf085d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 21:17:48 2016 +0000

    some raptor tweaks for --disable-dynload
    
    Change-Id: I63229ea57acc36b377f430d2305530cfe5617a35
    Reviewed-on: https://gerrit.libreoffice.org/32203
    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 4b21b93..49d0c91 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1172,11 +1172,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 	rdf \
 )
 else
-$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
 	-L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \
+	-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
+	-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal \
 )
 endif
 
@@ -1185,7 +1186,7 @@ endef
 else # ANDROID
 
 define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
+$(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
 
 endef