From nobody Tue Oct 3 20:39:28 2023 X-Original-To: dev-commits-ports-branches@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 4S0V6m3HWDz4vyMF; Tue, 3 Oct 2023 20:39:28 +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 4S0V6m2kvlz4jX3; Tue, 3 Oct 2023 20:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696365568; 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=jE+oWwo+brdamqNGagHe8Iy/MpPllnLwTfUoNouFRgs=; b=lu55EXnqyhOL34EceNlAOsPwYu/wtJGDEgTRWUMBYSqEz8vTYbTs9Havp8CW93C8mY2Zra uMb9EtJ8Q9O1j9Esfem8pxRrrjG0h3yPUI3iWFevcsW5EHhfM2eWApq5K+59ApZRIj6g56 B/JJn9F4l28w6r3w0IEN2Lctq2n/2RaVMl+KwE3y4gWNljL94qOcrKgwXxKJlQlugubgOd GvtABAhfNAUd8Sy2f4eH0eEXOZ47q6FWuh0C/hwwgTgKJC0wzqG8/jxlneRHTTNWsUwCnl mImZ7EPMlLmerf6qQ/Zl0rKWbIAhd3f+OQITWfzPslcxVtqkL5zs/45stWc1OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696365568; a=rsa-sha256; cv=none; b=HRCVfCFo4ajPB09Udqvv33dcy0hMX4U8JQbdNQLoPLuHcXdLihWywe0CwZxmDdvXTBAhj7 qDFbPkkXaF27w47eiy1K9H/J6g//ug0QJmyjTFZPoz+cUiVvLhx27wVRDJUZ93+8KHvwT/ m8HYGizlkYa0vcRwIj6J7TTSP4iu2vndaiTkBl2YqZwvGm7IwUV4adrPr8MfRWNyfh7KUU ZxICPIdBcFlNIPJtZ5meRCt6D+HN9WaciBiQgq2Tku9vL/LoNYtQrBtFIzV3/C1fe46q9R GTyjhVnglHYm7Mhevd/Eq21PgSDG4jyW1ctbzLAOQLGiFJF/leAtr6E55BFFrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696365568; 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=jE+oWwo+brdamqNGagHe8Iy/MpPllnLwTfUoNouFRgs=; b=cwKHyJ4e9ZCwWvhZih4LXwaWQHlnz74BVNae2qWWc3bOqk+vNvLwCrOe8UUWa5wv8Fg3iD ipyuE+H+W4Ojd+TvRPanBLZs93dXSmNAzk4obW68FxgPJhNYw3cEUSlkU3kgqoHnafWPT5 iFp48LXeeGXGzg/0t7oGcSRpvaV/I7OxZGCe0yt0Dc2tByePPHNbPvAXrlxFu0YbKXeCi3 AYz0sQvE+Cr5kH4GqvkeyqGMCd5JSc8jCivXd1Nr3n8Dqwr9+7zcjNaxJZSTHT7aKFqwIx PvoJT/uZzwhoGjspliKVVg5qz96wIA2Zj2CnE4Aj8fIoX7l5m8Xj2kiEdgDu2w== 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 4S0V6m1hdxz18d0; Tue, 3 Oct 2023 20:39:28 +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 393KdSmd004475; Tue, 3 Oct 2023 20:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393KdSin004472; Tue, 3 Oct 2023 20:39:28 GMT (envelope-from git) Date: Tue, 3 Oct 2023 20:39:28 GMT Message-Id: <202310032039.393KdSin004472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 77140fdb6f38 - 2023Q4 - databases/py-mysqlclient: fix build with mariadb List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 77140fdb6f38878c92e326b43f1dd6c46f5a3c9b Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=77140fdb6f38878c92e326b43f1dd6c46f5a3c9b commit 77140fdb6f38878c92e326b43f1dd6c46f5a3c9b Author: Rozhuk Ivan AuthorDate: 2023-09-05 10:36:16 +0000 Commit: Dima Panov CommitDate: 2023-10-03 20:39:12 +0000 databases/py-mysqlclient: fix build with mariadb PR: 272481 MFH: 2023Q4 (cherry picked from commit a63cc035abee4d9e1a89c8ac57c9efeb9ae974f5) --- databases/py-mysqlclient/Makefile | 2 +- databases/py-mysqlclient/files/patch-setup.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile index ea794fb9d777..70a85c7a0132 100644 --- a/databases/py-mysqlclient/Makefile +++ b/databases/py-mysqlclient/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR} -USES= compiler:c11 iconv mysql pkgconfig python ssl +USES= compiler:c11 dos2unix iconv mysql pkgconfig python ssl USE_PYTHON= autoplist concurrent pep517 PORTDOCS= * diff --git a/databases/py-mysqlclient/files/patch-setup.py b/databases/py-mysqlclient/files/patch-setup.py new file mode 100644 index 000000000000..4bb4df91be54 --- /dev/null +++ b/databases/py-mysqlclient/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py ++++ setup.py +@@ -14,7 +14,7 @@ + + def find_package_name(): + """Get available pkg-config package name""" +- packages = ["mysqlclient", "mariadb"] ++ packages = ["mysqlclient", "mariadb", "libmariadb"] + for pkg in packages: + try: + cmd = f"pkg-config --exists {pkg}"