diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2017-02-05 21:20:24 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2017-02-05 21:20:24 +0000 |
commit | 6d324c1f70c9ee4ebd41f6a689ac379f8d47927b (patch) | |
tree | 7c63a95968ed9b4eb610fca1b72ff17c7d9581c2 /databases/mariadb100-server/files/patch-cmake_ssl.cmake | |
parent | net/py-pyshark: Update to 0.3.6.2 (diff) |
- Remove inclusion of bsd.default-versions.mk from ftp/curl/Makefile so
bsd.default-versions.mk can rely on ARCH being defined.
- In bsd.port.mk move inclusion of bsd.default-versions.mk from the
pre-makefile section to the options section so the variables can be used
earlier. Also put the bit of code sitting between the options section and
the pre-makefile section into the options section.
- Remove last few cases where ports set WITH_OPENSSL_PORT. This variable is
handled in bsd.default-versions.mk and some ports were setting it after
including bsd.port.options.mk. After FreeBSD 9 EoL all but a few ports,
and then only when setting non-default options, work without setting that
variable.
PR: 215996
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=433456
Diffstat (limited to 'databases/mariadb100-server/files/patch-cmake_ssl.cmake')
-rw-r--r-- | databases/mariadb100-server/files/patch-cmake_ssl.cmake | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mariadb100-server/files/patch-cmake_ssl.cmake b/databases/mariadb100-server/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..0414d663f59c --- /dev/null +++ b/databases/mariadb100-server/files/patch-cmake_ssl.cmake @@ -0,0 +1,24 @@ +--- cmake/ssl.cmake.orig 2016-08-24 15:07:34 UTC ++++ cmake/ssl.cmake +@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL) + MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") + ENDIF() + +- # On mac this list is <.dylib;.so;.a> +- # We prefer static libraries, so we revert it here. +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() + MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>") + FIND_LIBRARY(OPENSSL_LIBRARIES + NAMES ssl ssleay32 ssleay32MD +@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL) + FIND_LIBRARY(CRYPTO_LIBRARY + NAMES crypto libeay32 + HINTS ${OPENSSL_ROOT_DIR}/lib) +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() + + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARIES AND |