summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-19 21:17:48 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-20 09:29:14 +0000
commit87114367d74526e738f8726e2567be5a0cf085d1 (patch)
treebecb59e660ecf556e5580ce0057b761dce0bb273 /RepositoryExternal.mk
parentc00b5ee5f2bab4e10f113e09372bd151d852912b (diff)
some raptor tweaks for --disable-dynload
Change-Id: I63229ea57acc36b377f430d2305530cfe5617a35 Reviewed-on: https://gerrit.libreoffice.org/32203 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4b21b93b04f7..49d0c9151e23 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