From owner-dev-commits-ports-main@freebsd.org Thu Jun 10 17:13:06 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 8AA59650F3C; Thu, 10 Jun 2021 17:13:06 +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 4G19Xf3TjGz3qLX; Thu, 10 Jun 2021 17:13:06 +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 55941137BF; Thu, 10 Jun 2021 17:13:06 +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 15AHD6On051887; Thu, 10 Jun 2021 17:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15AHD69S051886; Thu, 10 Jun 2021 17:13:06 GMT (envelope-from git) Date: Thu, 10 Jun 2021 17:13:06 GMT Message-Id: <202106101713.15AHD69S051886@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: 64be746e535b - main - lang/python3[89]: remove LIBFFI option 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: 64be746e535b0ca620460c95a819b81ac2159d01 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 17:13:06 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=64be746e535b0ca620460c95a819b81ac2159d01 commit 64be746e535b0ca620460c95a819b81ac2159d01 Author: Dmitry Marakasov AuthorDate: 2021-06-04 14:18:37 +0000 Commit: Dmitry Marakasov CommitDate: 2021-06-10 17:09:54 +0000 lang/python3[89]: remove LIBFFI option Python now requires libffi from ports and does not build with LIBFFI disabled, so remove the option. PR: 256141 Reported by: majo-bugs.freebsd.org@cerny.sk Reviewed by: koobs (python) Approved by: koobs (python) MFH: 2020Q2 (bugfix) --- lang/python38/Makefile | 19 ++++++------------- lang/python39/Makefile | 19 ++++++------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/lang/python38/Makefile b/lang/python38/Makefile index be973fca11ac..83a6943299b3 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -13,6 +13,8 @@ COMMENT= Interpreted object-oriented programming language LICENSE= PSFL +LIB_DEPENDS= libffi.so:devel/libffi + USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes @@ -29,7 +31,8 @@ PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm -CONFIGURE_ARGS+= --enable-shared --without-ensurepip +CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ + --with-system-ffi CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files @@ -48,13 +51,12 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC -OPTIONS_DEFAULT= LIBFFI LIBMPDEC PYMALLOC +OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC +OPTIONS_DEFAULT= LIBMPDEC PYMALLOC OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes -LIBFFI_DESC= Use libffi from ports instead of bundled version LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs @@ -69,9 +71,6 @@ SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 -LIBFFI_CONFIGURE_ON= --with-system-ffi -LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi - LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal @@ -99,12 +98,6 @@ PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc .endif -# https://bugs.python.org/issue22521 -# https://bugs.python.org/issue23042 -.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} -BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option -.endif - .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif diff --git a/lang/python39/Makefile b/lang/python39/Makefile index 8a9b87d3c043..227b7085a135 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -13,6 +13,8 @@ COMMENT= Interpreted object-oriented programming language LICENSE= PSFL +LIB_DEPENDS= libffi.so:devel/libffi + USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in @@ -30,7 +32,8 @@ PYTHON_VERSION= python${PYTHON_VER} PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm -CONFIGURE_ARGS+= --enable-shared --without-ensurepip +CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ + --with-system-ffi CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files @@ -49,13 +52,12 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XYZDOT=${DISTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC -OPTIONS_DEFAULT= LIBFFI LIBMPDEC PYMALLOC +OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC NLS PYMALLOC +OPTIONS_DEFAULT= LIBMPDEC PYMALLOC OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes -LIBFFI_DESC= Use libffi from ports instead of bundled version LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs @@ -70,9 +72,6 @@ SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 -LIBFFI_CONFIGURE_ON= --with-system-ffi -LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi - LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal @@ -100,12 +99,6 @@ PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc .endif -# https://bugs.python.org/issue22521 -# https://bugs.python.org/issue23042 -.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} -BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option -.endif - .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif