From owner-svn-ports-all@freebsd.org Thu Dec 24 13:14:03 2020 Return-Path: Delivered-To: svn-ports-all@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 0D07A4C3E28; Thu, 24 Dec 2020 13:14:03 +0000 (UTC) (envelope-from fluffy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1rBL72Lsz3v0Y; Thu, 24 Dec 2020 13:14:02 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E441D1135F; Thu, 24 Dec 2020 13:14:02 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BODE2xB002662; Thu, 24 Dec 2020 13:14:02 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BODE20i002661; Thu, 24 Dec 2020 13:14:02 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202012241314.0BODE20i002661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Thu, 24 Dec 2020 13:14:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559071 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 559071 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 13:14:03 -0000 Author: fluffy Date: Thu Dec 24 13:14:02 2020 New Revision: 559071 URL: https://svnweb.freebsd.org/changeset/ports/559071 Log: Mk/Uses/python.mk: introduce PYTHON_EXT_SUFFIX variable Since Python-3.8.7 it uses unified with other platforns shared libs naming scheme: instead of plain .so suffix now it refers to used cpython: .cpython-${PYTHON_SUFFIX}.so Future Python releases will use this scheme too, it will be hooked via version check PR: 252057 Approved by: python (wen) Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Thu Dec 24 13:12:48 2020 (r559070) +++ head/Mk/Uses/python.mk Thu Dec 24 13:14:02 2020 (r559071) @@ -442,6 +442,13 @@ PYTHON_MAJOR_VER= ${PYTHON_VER:R} PYTHON_REL= # empty PYTHON_ABIVER= # empty PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX} + +.if ${PYTHON_VER} == 3.8 +PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} +.else +PYTHON_EXT_SUFFIX= # empty +.endif + # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env(). .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR}) .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version" @@ -698,6 +705,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDI PYTHON_PLATFORM=${PYTHON_PLATFORM} \ PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \ PYTHON_SUFFIX=${PYTHON_SUFFIX} \ + PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERSION=${PYTHON_VERSION} .if ${PYTHON_REL} < 3000