From nobody Wed Nov 24 17:01:45 2021 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 F346218AFB95; Wed, 24 Nov 2021 17:01:47 +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 4HznNT43FVz4hQ7; Wed, 24 Nov 2021 17:01:45 +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 366D65C00; Wed, 24 Nov 2021 17:01:45 +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 1AOH1jMD070959; Wed, 24 Nov 2021 17:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOH1jKS070958; Wed, 24 Nov 2021 17:01:45 GMT (envelope-from git) Date: Wed, 24 Nov 2021 17:01:45 GMT Message-Id: <202111241701.1AOH1jKS070958@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 27f3f4018fbe - main - databases/py-sqlite3: fix build with python 3.11 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27f3f4018fbe293d3a12dd2fd8212a93c4619b9a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637773306; 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=sIzz6GP25Iu+hU1GXArQh5pqHbtme7Ij7SubykxD5TQ=; b=S3bzNqpArNf6keae9i/f9iF6me4JWjKKbipd/1X9SzWLPjvxaDySku+Q+lUsUqtzyOkUVU 68NS2PQgTypXhXVliIqhKqNoPgLCv/vgTqaI3YnAe+c+Mv3E11Y548Iq1S0wys5FQVnkck 5U8OgM7vZr8XBa94BLSjR/BsHP7whgbItXxZseq34XxEzW3SwIDLVniJ3ez89egiVOQnSP Ibay0C25+mqvSj25dBLAisWTQYjtMhcqLTQqg2NkslWVd8ifqKyyQg3eXHZMO7RBMIK/vY etREi1qbuavJYYU4YENOpBmDADu+iVIL0RpDGu4tkvtoyE2LMuvgpIBn0DoLQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637773306; a=rsa-sha256; cv=none; b=BiIXL/l/z+w1KYSo1Rh5Yn/w64H2m7NYIlfnxCUlTCnPDbJdhdvmNlr+L0RN8TJ9amqgOw xlH30UVVKC5Yw2ISlHHHIlsmMZNvqNj1I1HXvqb7WLuVdX9nVb7HXn09eRjXxIwFDBiPZP /LsxyErRraICxtWN1zNAgcS3GYDIBT1JP9nxPWMTzn7GLwVWJZG/pnO7UD5udLd49MNRlb /wpt3SRIB1Tzi61GZJ3zmMr9bta3toIdK23vrR+vk6Y8KLLR3GJJGbg7sXadfN6XEo/Nr9 CHXA/6hvTCT6i+zJMSWCdNggGo+k20C+q4DG1zYo2tug6Nz2kvMfGYSrzcaX0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=27f3f4018fbe293d3a12dd2fd8212a93c4619b9a commit 27f3f4018fbe293d3a12dd2fd8212a93c4619b9a Author: Dmitry Marakasov AuthorDate: 2021-11-10 20:27:02 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-24 17:00:33 +0000 databases/py-sqlite3: fix build with python 3.11 PR: 259745 Approved by: python --- databases/py-sqlite3/files/setup3.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py index 4a5bf6bb5ef6..7407503ceb54 100644 --- a/databases/py-sqlite3/files/setup3.py +++ b/databases/py-sqlite3/files/setup3.py @@ -3,6 +3,8 @@ # python setup.py install # +import platform + try: import distutils from distutils import sysconfig @@ -19,7 +21,6 @@ lib_dirs = [prefix + "/lib"] libs = ["sqlite3"] macros = [('MODULE_NAME', '"sqlite3"')] sqlite_srcs = [ -'_sqlite/cache.c', '_sqlite/connection.c', '_sqlite/cursor.c', '_sqlite/microprotocols.c', @@ -29,6 +30,11 @@ sqlite_srcs = [ '_sqlite/statement.c', '_sqlite/util.c'] +major, minor = map(int, platform.python_version_tuple()[:2]) + +if (major, minor) <= (3, 10): + sqlite_srcs.append('_sqlite/cache.c',) + try: import ctypes ctypes.CDLL('libsqlite3.so').sqlite3_load_extension