Kaydet (Commit) 87114367 authored tarafından Caolán McNamara's avatar Caolán McNamara

some raptor tweaks for --disable-dynload

Change-Id: I63229ea57acc36b377f430d2305530cfe5617a35
Reviewed-on: https://gerrit.libreoffice.org/32203Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c00b5ee5
...@@ -1172,11 +1172,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\ ...@@ -1172,11 +1172,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
rdf \ rdf \
) )
else 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),\ $(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,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 endif
...@@ -1185,7 +1186,7 @@ endef ...@@ -1185,7 +1186,7 @@ endef
else # ANDROID else # ANDROID
define gb_LinkTarget__use_librdf define gb_LinkTarget__use_librdf
$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) $(call gb_LinkTarget_use_packages,$(1),redland raptor rasqal)
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment