From owner-svn-ports-all@freebsd.org Sun Jan 20 17:21:12 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F3D5149AF79; Sun, 20 Jan 2019 17:21:12 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA53B706AF; Sun, 20 Jan 2019 17:21:11 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCB86573E; Sun, 20 Jan 2019 17:21:11 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0KHLBHi019709; Sun, 20 Jan 2019 17:21:11 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0KHLBnA019705; Sun, 20 Jan 2019 17:21:11 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201901201721.x0KHLBnA019705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Sun, 20 Jan 2019 17:21:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r490803 - in branches/2019Q1/databases/mysql80-client: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2019Q1/databases/mysql80-client: . files X-SVN-Commit-Revision: 490803 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DA53B706AF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2019 17:21:12 -0000 Author: mmokhi Date: Sun Jan 20 17:21:11 2019 New Revision: 490803 URL: https://svnweb.freebsd.org/changeset/ports/490803 Log: MFH: r490801 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 Approved by: portmgr (bugfix blanket) Modified: branches/2019Q1/databases/mysql80-client/Makefile branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/databases/mysql80-client/Makefile ============================================================================== --- branches/2019Q1/databases/mysql80-client/Makefile Sun Jan 20 17:20:11 2019 (r490802) +++ branches/2019Q1/databases/mysql80-client/Makefile Sun Jan 20 17:21:11 2019 (r490803) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) Modified: branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Sun Jan 20 17:20:11 2019 (r490802) +++ branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Sun Jan 20 17:21:11 2019 (r490803) @@ -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}")