From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 23:03:08 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 C43E05C1384; Tue, 6 Apr 2021 23:03:08 +0000 (UTC) (envelope-from git@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 4FFNNV1Dm6z55B3; Tue, 6 Apr 2021 23:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF65014D98; Tue, 6 Apr 2021 23:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136N34WR004791; Tue, 6 Apr 2021 23:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136N343K004790; Tue, 6 Apr 2021 23:03:04 GMT (envelope-from git) Date: Tue, 6 Apr 2021 23:03:04 GMT Message-Id: <202104062303.136N343K004790@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: d1e9ddfd8331 - main - databases/mariadb*: fix build ahead of CMake 3.20 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1e9ddfd83317153a035ad80305ba472cadc5a73 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 23:03:11 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1e9ddfd83317153a035ad80305ba472cadc5a73 commit d1e9ddfd83317153a035ad80305ba472cadc5a73 Author: Adriaan de Groot AuthorDate: 2021-04-06 22:56:14 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-06 23:02:53 +0000 databases/mariadb*: fix build ahead of CMake 3.20 All of the MariaDB releases contain the same ConnectorName CMake module, and all of those copies of the module contain the same syntax error. CMake < 3.20 ignores this and treats end() as endif(), but this is an error in the upcoming version. Specifically NOT bumping PORTREVISION because this is a build-only fix that has no effect on the package. --- databases/mariadb-connector-c/Makefile | 1 - .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 +++++++++++ .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 +++++++++++ .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 +++++++++++ .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 +++++++++++ .../files/patch-libmariadb_cmake_ConnectorName.cmake | 11 +++++++++++ 6 files changed, 55 insertions(+), 1 deletion(-) diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile index 4b30e1272239..4767d6110b4d 100644 --- a/databases/mariadb-connector-c/Makefile +++ b/databases/mariadb-connector-c/Makefile @@ -1,4 +1,3 @@ - PORTNAME= mariadb-connector-c PORTVERSION= 3.1.10 CATEGORIES= databases diff --git a/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..0cdf01e6f5b2 --- /dev/null +++ b/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -0,0 +1,11 @@ +--- cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC ++++ cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -0,0 +1,11 @@ +--- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC ++++ libmariadb/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -0,0 +1,11 @@ +--- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC ++++ libmariadb/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -0,0 +1,11 @@ +--- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC ++++ libmariadb/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -0,0 +1,11 @@ +--- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC ++++ libmariadb/cmake/ConnectorName.cmake +@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") + SET(MACHINE_NAME "x64") + ELSE() + SET(MACHINE_NAME "32") +- END() ++ ENDIF() + ENDIF() + + SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")