From owner-svn-ports-head@freebsd.org Wed Feb 3 14:12:28 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2F93E538108; Wed, 3 Feb 2021 14:12:28 +0000 (UTC) (envelope-from fluffy@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DW3Xr0w37z4f2H; Wed, 3 Feb 2021 14:12:28 +0000 (UTC) (envelope-from fluffy@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 123902215E; Wed, 3 Feb 2021 14:12:28 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 113ECRa4088946; Wed, 3 Feb 2021 14:12:27 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 113ECRV9088945; Wed, 3 Feb 2021 14:12:27 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202102031412.113ECRV9088945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Wed, 3 Feb 2021 14:12:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563886 - head/databases/mysql80-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/databases/mysql80-server/files X-SVN-Commit-Revision: 563886 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2021 14:12:28 -0000 Author: fluffy Date: Wed Feb 3 14:12:27 2021 New Revision: 563886 URL: https://svnweb.freebsd.org/changeset/ports/563886 Log: databases/mysql80-server: regen patch-client_CMakeLists.txt PR: 253198 Modified: head/databases/mysql80-server/files/patch-client_CMakeLists.txt Modified: head/databases/mysql80-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mysql80-server/files/patch-client_CMakeLists.txt Wed Feb 3 13:47:52 2021 (r563885) +++ head/databases/mysql80-server/files/patch-client_CMakeLists.txt Wed Feb 3 14:12:27 2021 (r563886) @@ -1,6 +1,6 @@ --- client/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ client/CMakeLists.txt -@@ -23,8 +23,11 @@ +@@ -28,8 +28,11 @@ DISABLE_MISSING_PROFILE_WARNING() ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) ## Subdirectory for mysqlpump code. @@ -12,15 +12,15 @@ MYSQL_ADD_EXECUTABLE(mysql ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc completion_hash.cc -@@ -33,6 +36,7 @@ MYSQL_ADD_EXECUTABLE(mysql - readline.cc +@@ -39,6 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysql + client_query_attributes.cc LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} ) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -48,6 +52,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL " +@@ -55,6 +59,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND ) ENDIF() @@ -28,7 +28,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc mysqltest/error_names.cc -@@ -63,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest +@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest ENABLE_EXPORTS LINK_LIBRARIES mysqlclient ) @@ -38,15 +38,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc check/mysqlcheck_core.cc -@@ -80,6 +88,7 @@ MYSQL_ADD_EXECUTABLE(mysqlshow - mysqlshow.cc - LINK_LIBRARIES mysqlclient - ) -+ - MYSQL_ADD_EXECUTABLE(mysqlbinlog - mysqlbinlog.cc - ${CMAKE_SOURCE_DIR}/sql/json_binary.cc -@@ -104,7 +113,9 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog +@@ -246,7 +254,9 @@ ENDIF() TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) @@ -56,7 +48,7 @@ MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc LINK_LIBRARIES mysqlclient -@@ -117,6 +128,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor +@@ -259,6 +269,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc LINK_LIBRARIES mysqlclient ) @@ -66,7 +58,7 @@ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc LINK_LIBRARIES mysqlclient -@@ -127,6 +141,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup +@@ -269,6 +282,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup path.cc LINK_LIBRARIES mysys )