diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-01-20 17:14:19 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-01-20 17:14:19 +0000 |
| commit | 620773ed1faf3bf4c8fd97c62ee29d468d3bad2b (patch) | |
| tree | bf720f65826fcceb95b4f174ad91f5d014c45b5d /databases/mysql80-client | |
| parent | net-p2p/transmission-cli: change transmission's data size unit conversion fac... (diff) | |
databases/mysql80-client: Fix output of mysql_config for ldflags
Make `mysql_config` not show non-existing libraries as output of `--lib`.
(`imported_crypto` and `imported_openssl` which seem to be for internal use)
This issue made build-failures on downstream codes that rely on
correct output to use for their LDFLAGS (like mail/dovecot).
Reported by: ler
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'databases/mysql80-client')
| -rw-r--r-- | databases/mysql80-client/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql80-client/files/patch-scripts_CMakeLists.txt | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index f666f66bf6f8..2d48a0d44d40 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt index e63cc1b920aa..42f0981daadf 100644 --- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2018-11-04 20:58:12 UTC +--- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC +++ scripts/CMakeLists.txt @@ -80,6 +80,7 @@ ELSE() MESSAGE(FATAL_ERROR "Cannot concatenate files") @@ -32,6 +32,15 @@ # TCMalloc hacks IF(MALLOC_LIB) +@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) + FOREACH(lib ${${target}_LIB_DEPENDS}) + # Filter out "general", it is not a library, just CMake hint +- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ") ++ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto") + IF (lib MATCHES "^\\-l") + SET(${var} "${${var}} ${lib} ") + ELSEIF(lib MATCHES "^/") @@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") |