Kaydet (Commit) a7b9d29d authored tarafından Tor Lillqvist's avatar Tor Lillqvist

We don't want libxmlsec on iOS, I think

It would require NSS which I just decided to skip. If/when we patch it
to support native iOS (and OS X?) crypto APIs, re-consider. Or
something.

Now the TiledLibreOffice iOS demo app builds again.

Change-Id: I2816a49bbdbde5a8f9d3b9fcdfff420bdca05ff8
üst 6ac7b466
...@@ -44,8 +44,6 @@ ANDROID) ...@@ -44,8 +44,6 @@ ANDROID)
;; ;;
IOS) IOS)
oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/.libs/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/xmlsec/src/nss/.libs/*.a"
;; ;;
*) *)
oslibs= oslibs=
......
...@@ -19,7 +19,7 @@ endif ...@@ -19,7 +19,7 @@ endif
$(eval $(call gb_Module_add_moduledirs,external,\ $(eval $(call gb_Module_add_moduledirs,external,\
accessories \ accessories \
libxmlsec \ $(if $(filter-out IOS,$(OS)),libxmlsec) \
$(call gb_Helper_optional,ABW,libabw) \ $(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \ $(call gb_Helper_optional,APR,apr) \
......
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