svn commit: r490801 - in head/databases/mysql80-client: . files
Mahdi Mokhtari
mmokhi at FreeBSD.org
Sun Jan 20 17:14:20 UTC 2019
Author: mmokhi
Date: Sun Jan 20 17:14:19 2019
New Revision: 490801
URL: https://svnweb.freebsd.org/changeset/ports/490801
Log:
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
Modified:
head/databases/mysql80-client/Makefile
head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
Modified: head/databases/mysql80-client/Makefile
==============================================================================
--- head/databases/mysql80-client/Makefile Sun Jan 20 17:02:27 2019 (r490800)
+++ head/databases/mysql80-client/Makefile Sun Jan 20 17:14:19 2019 (r490801)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client)
Modified: head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
==============================================================================
--- head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Sun Jan 20 17:02:27 2019 (r490800)
+++ head/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Sun Jan 20 17:14:19 2019 (r490801)
@@ -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}")
More information about the svn-ports-head
mailing list