diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-26 02:03:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-05-26 02:03:56 +0300 |
| commit | 1f8ffa754e3a9584aa10994ed40a5d959a53a13b (patch) | |
| tree | 91eb59733e13c7af2e3abd4621017c9d513507dc | |
| parent | bcf04a28cc49a9f605dc0d116449a3a4479369e1 (diff) | |
Use separately built "system" OpenSSL for iOS
The configury in the bundled obsolete version of OpenSSL is just too
horrible to even bother patching up to work for cross-compiling to
iOS. There are several ways to build OpenSSL for iOS described on the
net, let's just use one of them.
| -rwxr-xr-x | configure.in | 21 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeiOS.conf | 1 |
2 files changed, 17 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 6ed7ea1fc14e..6b6d6cf4d2f6 100755 --- a/configure.in +++ b/configure.in @@ -5729,12 +5729,23 @@ AC_MSG_CHECKING([which libssl to use]) if test -n "$with_system_openssl" -o -n "$with_system_libs" && \ test "$with_system_openssl" != "no"; then AC_MSG_RESULT([external]) - # Mac OS builds should get out without extra stuff is the Mac porters' - # wish. And pkg-config is although Xcode ships a .pc for openssl - if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ + + dnl Mac OS (and BSD, apparently) builds should get out without + dnl extra stuff is the Mac porters' wish. And pkg-config is + dnl although Xcode ships a .pc for OpenSSL + + dnl For iOS we don't want to even try compiling bundled (outdated + dnl version of) OpenSSL with its ultra-weird configury. But on the + dnl other hand there is no system OpenSSL either. But let's just + dnl build a current OpenSSL separately using some of the ways + dnl found on the net and pretend it is a "system" OpenSSL. + + dnl In either case pass OPENSSL_CFLAGS and OPENSSL_LIBS if + dnl necessary in the environment. + + if test "$_os" = "Darwin" -o "$_os" = "iOS" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ "$_os" = "DragonFly"; then - OPENSSL_CFLAGS= - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS=${OPENSSL_LIBS:--lssl -lcrypto} else PKG_CHECK_MODULES( OPENSSL, openssl ) fi diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 02008d5511fc..20231741682e 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -15,6 +15,7 @@ --disable-randr --disable-randr-link --disable-systray +--with-system-openssl --without-fonts --without-java --without-junit |