Kaydet (Commit) 3584c954 authored tarafından jan Iversen's avatar jan Iversen

iOS disable gpgme

Disable gpgme called for passing parameters to configure, when called
internally (to generate config_build etc).

Update the distro-conf, with info on the different supported models

Change-Id: I884c8638bf7b1c9fbc8ea4bdaa4dfca019857f45
üst 61be109b
......@@ -633,6 +633,7 @@ darwin*) # Mac OS X or iOS
AC_MSG_NOTICE([sanitized the PATH to $PATH])
fi
if test "$host_cpu" = "arm64" -o "$enable_ios_simulator" = "yes"; then
build_for_ios=YES
_os=iOS
test_gtk=no
test_cups=no
......@@ -4379,6 +4380,7 @@ if test "$cross_compiling" = "yes"; then
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
test "$build_for_ios" = "YES" && sub_conf_opts="$sub_conf_opts build_for_ios=YES"
sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
# Don't bother having configure look for stuff not needed for the build platform anyway
./configure \
......@@ -10120,7 +10122,10 @@ fi
AC_SUBST(ENABLE_PDFIUM)
SYSTEM_GPGMEPP=
if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
if test "$build_for_ios" = "YES"; then
AC_MSG_CHECKING([gpgmepp disabled due to iOS])
elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
dnl ===================================================================
dnl Check for system gpgme
dnl ===================================================================
......
......@@ -27,9 +27,17 @@
--disable-python
--without-tls
--enable-debug
--enable-werror
# iOS simulator (debug)
#--enable-ios-simulator
#--enable-debug
# iOS Device (debug)
#--enable-ios-simulator
#--enable-debug
#--host=arm64-apple-darwin
# iOS Device (release)
--host=arm64-apple-darwin
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