From nobody Sun Jul 09 10:46:21 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzP261FfGz4lq56; Sun, 9 Jul 2023 10:46:22 +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 4QzP2607S2z4bZw; Sun, 9 Jul 2023 10:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zhCoIMGYVV772pLiKIbyNdxT3cGKeyxuW3qoXHzLeFU=; b=TkH8ZLuVk+RSDbdcn98wy64JAVrtbQLa1xhTnF/HN8QYV8EfNmcW6GbmX+JoILimjbnqud WY0kE+vo8ccD/tJBH8GeDg+FZyaEbIXe7FDxcFWQNaGLY84UHDceJSsHeXa0GXvg9wHu/O 8YjkrhiAjgFIYlTz9Y4CVWOP9FVVIW2JadMsNSFcVMHMmN8MGl3Jx7DW2KJmvvmjBhMFkU 8Iin0sfn0YhiCOYDAe7MJN1cLTwqrC/Mt+U11jmbnWdlKiP0h8DPtjxQYpczazP0II7ZCq Hkw6yBInajereIkIAuAGGZG1UBZb866S4n4nr7qzYPYNV2Lz+9AWic2k1ZD1SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zhCoIMGYVV772pLiKIbyNdxT3cGKeyxuW3qoXHzLeFU=; b=GXfZ61me+aHjziW3ckGAlUEx/rFplsFaUpZRuGbSuf5djqmuAkNToOsnAV7bjNSAGgINxX iBhS5rog+1dIyt34jDULvEYjM9luaagM1a0jGSEMzwmoJsDuoJDEgjlZ/l+hvX7oTKpev8 GvVUNIJus5y4g6NYY8iHJ1ST+mRQLbMex3peXruRL6jJlyl4MVhNsedAfcEd6ZM5T1VoXi jn+rbfTE8896SjH0LErS8zxz5dvGjYPhiidRoNG3EKRT/DiYyho69hRiqh8pa0DHHUgxZF 1CkHOM5RMQQBuSmwRDB2LiREQIRtTWssYjPx/b7FNYfENwQK3l+k4Evhxw1USA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688899582; a=rsa-sha256; cv=none; b=hZhjdsr8hIcVG/teDw8hBU7uAAwKDICYoRlHXhd/gri58kQ3+bcvEp9evc78QaJup1l059 4lkJ8dmgc3f89cni+5VGoanw8w+momvVY7aNjMrIVaHiC0Sh5IvREBEjA+nWq393q2/uh6 KHwtBBMzeKBuyix7RDnsNYeSmAcLaVSo2dU8eAirdSYvUI/ruoSB5G91TIsWL8RDsmDunM UlWz/oenQGsyH9SaWw4sjfRiPo5gGgb7IFFOdLX1W14vbXO9y4vdihpakhxQG0RDzce6Kk Mmx9Xi+rtbdP5JdYosD+yKSeLw2MXOpmDbETL+UTJFIhrWMBdfED6IZgRNZEIg== 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 4QzP256Gs4z10Xx; Sun, 9 Jul 2023 10:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AkLxY084936; Sun, 9 Jul 2023 10:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AkLOA084935; Sun, 9 Jul 2023 10:46:21 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:46:21 GMT Message-Id: <202307091046.369AkLOA084935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5ee3f5d80cb3 - main - databases/mysql80-client: Fix mysqlclient.pc List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ee3f5d80cb37c8ecbf55093b009c1ab1209b505 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ee3f5d80cb37c8ecbf55093b009c1ab1209b505 commit 5ee3f5d80cb37c8ecbf55093b009c1ab1209b505 Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 10:31:54 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-09 10:31:54 +0000 databases/mysql80-client: Fix mysqlclient.pc - Bump PORTREVISION for package change Not all supported FreeBSD releases has openssl.pc in base system. This patch adds a check for openssl.pc. It helps to build databases/py-mysqlclient. If you do not have openssl.pc from your SSL provider. Before the fix: % grep Requires.private: /usr/local/libdata/pkgconfig/mysqlclient.pc Requires.private: openssl After the fix: % grep Requires.private: /usr/local/libdata/pkgconfig/mysqlclient.pc Requires.private: The build log [1] of databases/py-mysqlclient without the fix: ===> Building for py39-mysqlclient-2.2.0 * Getting build dependencies for wheel... Package openssl was not found in the pkg-config search path. Perhaps you should add the directory containing `openssl.pc' to the PKG_CONFIG_PATH environment variable Package 'openssl', required by 'mysqlclient', not found Trying pkg-config --exists mysqlclient Traceback (most recent call last): File "/usr/local/lib/python3.9/site-packages/pyproject_hooks/_in_process/_in_process.py", line 353, in main() File "/usr/local/lib/python3.9/site-packages/pyproject_hooks/_in_process/_in_process.py", line 335, in main json_out['return_val'] = hook(**hook_input['kwargs']) File "/usr/local/lib/python3.9/site-packages/pyproject_hooks/_in_process/_in_process.py", line 118, in get_requires_for_build_wheel return hook(config_settings) File "/usr/local/lib/python3.9/site-packages/setuptools/build_meta.py", line 177, in get_requires_for_build_wheel return self._get_build_requires( File "/usr/local/lib/python3.9/site-packages/setuptools/build_meta.py", line 159, in _get_build_requires self.run_setup() File "/usr/local/lib/python3.9/site-packages/setuptools/build_meta.py", line 174, in run_setup exec(compile(code, __file__, 'exec'), locals()) File "setup.py", line 154, in ext_options = get_config_posix(get_options()) File "setup.py", line 50, in get_config_posix cflags = subprocess.check_output( File "/usr/local/lib/python3.9/subprocess.py", line 424, in check_output return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, File "/usr/local/lib/python3.9/subprocess.py", line 528, in run raise CalledProcessError(retcode, process.args, subprocess.CalledProcessError: Command 'pkg-config --cflags mysqlclient' returned non-zero exit status 1. ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel *** Error code 1 Stop. make: stopped in /usr/ports/databases/py-mysqlclient Approved by: portmgr (blanket) Reference: https://pkg-status.freebsd.org/beefy16/data/131amd64-default/0f3f003a3111/logs/py39-mysqlclient-2.2.0.log [1] --- databases/mysql80-client/Makefile | 2 +- databases/mysql80-server/Makefile | 9 ++++++++- .../mysql80-server/files/extra-patch-scripts_CMakeLists.txt | 10 ++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 9cfa8d717d8b..3ac1d1bcef1b 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 876d9757d1a3..1d5156b365ef 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -194,9 +194,16 @@ CXXFLAGS+= -malign-double USES+= compiler:c++17-lang .endif +.include + post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h +# This can be removed after FreeBSD 12.4 and 13.1 EoL +.if defined(CLIENT_ONLY) && !exists(${OPENSSLBASE}/libdata/pkgconfig/openssl.pc) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-scripts_CMakeLists.txt +.endif + .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} @@ -206,4 +213,4 @@ post-install: ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif -.include +.include diff --git a/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..df891b025ccd --- /dev/null +++ b/databases/mysql80-server/files/extra-patch-scripts_CMakeLists.txt @@ -0,0 +1,10 @@ +--- scripts/CMakeLists.txt.orig 2022-12-16 15:34:44 UTC ++++ scripts/CMakeLists.txt +@@ -362,7 +362,6 @@ IF (WITH_SSL STREQUAL "system") + # We have implemented "system" for other platforms as well, but those + # are non-native packages. + IF(LINUX OR SOLARIS OR FREEBSD) +- SET(CONFIG_REQUIRES_PRIVATE "openssl") + STRING(REPLACE "-lssl" "" CONFIG_LIBS_PRIVATE "${CONFIG_LIBS_PRIVATE}") + STRING(REPLACE "-lcrypto" "" CONFIG_LIBS_PRIVATE "${CONFIG_LIBS_PRIVATE}") + STRING(REGEX REPLACE "[ ]+" " " CONFIG_LIBS_PRIVATE