diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2013-12-30 10:55:47 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-20 15:05:24 +0000 |
| commit | 8ae8d5165c29cb899e6a8a57d1021a844ac30b30 (patch) | |
| tree | 9c9dccbde8d15c4b415069da19b872a7af48a9e5 | |
| parent | d33b4c311e3b9c0b8f50080cb38a31c19f587a16 (diff) | |
Get bundled openssl to be used on OS X too, at least on OS X <10.7
Also note that OpenSSL is incompatible with -fvisibility=hidden on OS X
Change-Id: I1fc3cf4d515ef210f996cb04ba9c1b3216109137
Reviewed-on: https://gerrit.libreoffice.org/7233
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 9e5f7de9c0a0..eb024d78b90f 100644 --- a/configure.ac +++ b/configure.ac @@ -9375,19 +9375,11 @@ if test "$enable_openssl" = "yes"; then # # http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion # http://stackoverflow.com/questions/7475914/libcrypto-deprecated-on-mac-os-x-10-7-lion - # - # They apparently got fed up with the unstable ABI of - # OpenSSL, or something, and recommend you either move to - # their "Common Crypto Architecture", or, if you have to stay - # with OpenSSL, just build it yourself statically and bundle - # with your application. with_system_openssl=no libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) - elif test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ - "$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then - # 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 + elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \ + && test "$with_system_openssl" != "no"; then with_system_openssl=yes SYSTEM_OPENSSL=YES OPENSSL_CFLAGS= diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 919e354f6d7f..d04c1867675d 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) build_libs \ - CC="$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\ + CC="$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden))" \ ) |