diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-02-27 13:34:06 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 07:24:25 -0600 |
| commit | 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e (patch) | |
| tree | cc505824cde445e14071c86e2a33b350e0214f19 /external | |
| parent | 55eb86699d7d4b2151530e9a0b3ca2e99033595b (diff) | |
curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5
Change-Id: I3e8576926df875d73de10d5212adde2685c3a799
Reviewed-on: https://gerrit.libreoffice.org/8386
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 3f3336b4a9f4..e1d8c0755213 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -36,14 +36,19 @@ curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss endif # use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage +# (note that --with-darwinssl option is not very compatible) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter MACOSX IOS,$(OS)),\ - --with-darwinssl, \ + $(if $(filter IOS,$(OS)),\ + --with-darwinssl \ --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--without-nss,\ + --with-darwinssl \ + --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ |