From nobody Tue Oct 3 20:38:23 2023 X-Original-To: dev-commits-ports-main@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 4S0V5X0WDMz4vyBG; Tue, 3 Oct 2023 20:38:24 +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 4S0V5W75RPz4jNW; Tue, 3 Oct 2023 20:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696365504; 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=xy6+/m5wCOVJLrbeSgwMX6YIhXmMsX4hE9oQK6mWB8U=; b=FPPBW4HLEC9fsmVjJK161SLCkgI8jE7iwkbOTtno1NKOaISjfDs0cK4pnz7E/2n8WnasX7 hmG3WABQcyMHI6njBh9a3k7J7NzNOLc+6X+vGH2T+oJF7Y2QjMzrzit1PYnN3QNDK4AvBG Pb/AUp05LUkNylMRT6lNVSHhIgqCyYvKf8qb9cHUDu7SoU4s6WooRA7GQqUUp/bR4fHcPe JxRd0DO8DXXZZ7D1cs0/+eRGTkZVthRzsFvp/yf1rhYWZcMmxSrk/us6eFMI+Anhc/2h6U E2KyIrgoH7lpMWj6kGgViDV20rk4JXVF4nVokKNg2AlVDIieVX1Z895Z0oS3Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696365504; a=rsa-sha256; cv=none; b=L9wD7RATsz4u2mXpezLjwkixA7Rnn5RMfotgiRCFECDejZFnXlYOUSTAADufVp5hgczjEd 5Jk54xCY7K7UEEMLNbvh+gQt6R+FFVf6qzY3UCN8Iwk9Xrx6jbWu2M6/UhE7xBRX7M3Vg8 jnGtMx1TagGpf4pVWpAf+6Q6KPmvoFjTQBdujeVkqqollyD+xrRt4vWUlOcqtxHCBrbGjM cN4Nc4EH5EZg2EHNQLsTygEytEumEAnD1WQKyQHQ5hl3QZtdUnHPRU2DPL65/1tbc9a7lL xLeOeKQ9YY6t1hPh7+qqIMuSBm0imUMFBYflwe7vMoIei+xk6GXzqZFl8+6QBQ== 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=1696365504; 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=xy6+/m5wCOVJLrbeSgwMX6YIhXmMsX4hE9oQK6mWB8U=; b=df5DpRxRCaItKD+9QgVBf10eMq+Q2VQ9hPcWVJz4zIVEsGxseRmyg9TFxpCzTgHPligDo9 eGAqx5uiKeoi+9feE0HBZlP2D3KEBT6sTsmMKFb6dAAYHILH04vafMPmgzjVkUBLLq5oyk DSE2byPeKRcmfGlfW0nuLmaBTxd1mCGd8eRScR5iNfQBJASGY5SztRFwlzZa2tZAxeLlA+ QaAXBBoPYduQDDMdx3KrO/HGlzhhqyCEzJrE8VvIo89Jnwd7Baz4R60M48jGxM7O5wPJV7 dJ0sxH/SblkisU0yu/DDSagmXnzPIQPLiSwgQHF088BkiByGzyiOOoQCPePVKw== 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 4S0V5W5ljYz18MP; Tue, 3 Oct 2023 20:38:23 +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 393KcNaG004174; Tue, 3 Oct 2023 20:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393KcNIw004171; Tue, 3 Oct 2023 20:38:23 GMT (envelope-from git) Date: Tue, 3 Oct 2023 20:38:23 GMT Message-Id: <202310032038.393KcNIw004171@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: a63cc035abee - main - databases/py-mysqlclient: fix build with mariadb List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: a63cc035abee4d9e1a89c8ac57c9efeb9ae974f5 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a63cc035abee4d9e1a89c8ac57c9efeb9ae974f5 commit a63cc035abee4d9e1a89c8ac57c9efeb9ae974f5 Author: Rozhuk Ivan AuthorDate: 2023-09-05 10:36:16 +0000 Commit: Dima Panov CommitDate: 2023-10-03 20:37:25 +0000 databases/py-mysqlclient: fix build with mariadb PR: 272481 MFH: 2023Q4 --- 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}"