From 35315d3538d1bc0cfbea3bdd8691529e313d0860 Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Thu, 19 Mar 2020 07:18:35 +0000 Subject: [PATCH] - Update to 3.7.7 - Remove the LIBFFI option PR: 244782 Submitted by: wen@(myself) Exp-run by: antoine@ --- lang/python-doc-html/distinfo | 18 +++++++++--------- lang/python37/Makefile | 19 ++++++------------- lang/python37/Makefile.version | 2 +- lang/python37/distinfo | 6 +++--- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo index 51bf5a2c9841..458d540e09c6 100644 --- a/lang/python-doc-html/distinfo +++ b/lang/python-doc-html/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1583051132 +TIMESTAMP = 1584095619 SHA256 (python/python-2.7.17-docs-html.tar.bz2) = d7388cfcf28591e5ab09932f70d180b1288130942779ead1fb40f750d72c18eb SIZE (python/python-2.7.17-docs-html.tar.bz2) = 4605137 SHA256 (python/python-2.7.17-docs-pdf-a4.tar.bz2) = b4e09d093f03dd879ad207a9043212d6adb9a40e90540f1526315c361faf2219 @@ -23,14 +23,14 @@ SHA256 (python/python-3.6.9-docs-pdf-letter.tar.bz2) = 656e70bfff58d1815507ca7cd SIZE (python/python-3.6.9-docs-pdf-letter.tar.bz2) = 13819027 SHA256 (python/python-3.6.9-docs-text.tar.bz2) = bbcce937a6853310f987c2a9434224f03180927622b86ab60feb4176cfcd8ec5 SIZE (python/python-3.6.9-docs-text.tar.bz2) = 2165791 -SHA256 (python/python-3.7.6-docs-html.tar.bz2) = 8d1c9b3fcde4af61e27cca1f650c5af820894bfad4647eb9ffac2dee755eb741 -SIZE (python/python-3.7.6-docs-html.tar.bz2) = 6248802 -SHA256 (python/python-3.7.6-docs-pdf-a4.tar.bz2) = 3c2b0023380e446aee8f42ea1da991ded4d8eac4facfa191848fac5531c10d1f -SIZE (python/python-3.7.6-docs-pdf-a4.tar.bz2) = 14175221 -SHA256 (python/python-3.7.6-docs-pdf-letter.tar.bz2) = 2a41da06ef88b64c6d7e7acff4e9fbcc11aaa5d4ab1f85441d770f72fac52f16 -SIZE (python/python-3.7.6-docs-pdf-letter.tar.bz2) = 14280574 -SHA256 (python/python-3.7.6-docs-text.tar.bz2) = d578cc43b12c9f019bd80a3097f40c15c38a91dcc5155903dc113cd7508a7ec6 -SIZE (python/python-3.7.6-docs-text.tar.bz2) = 2285753 +SHA256 (python/python-3.7.7-docs-html.tar.bz2) = f9f2a375eaf847ea927edafd0d64aaef76e32db7cfdcafc7d5a198feff48613f +SIZE (python/python-3.7.7-docs-html.tar.bz2) = 6259882 +SHA256 (python/python-3.7.7-docs-pdf-a4.tar.bz2) = b14cf18f78b8db5e099869256f9cd959056d22e2f98321dd4fa162e32dc1f655 +SIZE (python/python-3.7.7-docs-pdf-a4.tar.bz2) = 14184523 +SHA256 (python/python-3.7.7-docs-pdf-letter.tar.bz2) = ff6399745e5efdbd7dabff823b5c2e17b3b8a35b3daa6da06b7a81725e452021 +SIZE (python/python-3.7.7-docs-pdf-letter.tar.bz2) = 14289660 +SHA256 (python/python-3.7.7-docs-text.tar.bz2) = 26231081c1214e2ab1af1001607bafb25ee10ef8671e7f5722782f63e9415bd8 +SIZE (python/python-3.7.7-docs-text.tar.bz2) = 2288271 SHA256 (python/python-3.8.2-docs-html.tar.bz2) = e12135b29ef231fce0d20c5865cf7fb37cecea11f2304e389325b04e9281558a SIZE (python/python-3.8.2-docs-html.tar.bz2) = 6536475 SHA256 (python/python-3.8.2-docs-pdf-a4.tar.bz2) = 9cf8ac9960c5db0594c7c9d9cee33d31fa8619277c496a257e434f9887b8053e diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 8d67478e446d..14ce6165f6bc 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -14,6 +14,8 @@ COMMENT= Interpreted object-oriented programming language LICENSE= PSFL +LIB_DEPENDS= libffi.so:devel/libffi + USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes @@ -27,7 +29,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 @@ -46,13 +49,12 @@ PLIST_SUB= ABI=${ABIFLAGS} \ XYZDOT=${PORTVERSION} \ 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 NLS PYMALLOC -OPTIONS_DEFAULT= LIBFFI PYMALLOC +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC +OPTIONS_DEFAULT= PYMALLOC OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes -LIBFFI_DESC= Use libffi from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs @@ -66,9 +68,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 - # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat # to break in Python 2.7, or preprocessor complaints in Python >= 3.3 # Upstream Issue: https://bugs.python.org/issue6299 @@ -96,12 +95,6 @@ PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \ libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.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/python37/Makefile.version b/lang/python37/Makefile.version index f9a70b3122e0..37348f384275 100644 --- a/lang/python37/Makefile.version +++ b/lang/python37/Makefile.version @@ -3,4 +3,4 @@ # Do not forget to update python documentation (lang/python-doc-*) # Run "make -C lang/python-doc-html makesum" -PYTHON_PORTVERSION= 3.7.6 +PYTHON_PORTVERSION= 3.7.7 diff --git a/lang/python37/distinfo b/lang/python37/distinfo index 293054eb1790..f708f72b9859 100644 --- a/lang/python37/distinfo +++ b/lang/python37/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1576888579 -SHA256 (python/Python-3.7.6.tar.xz) = 55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f -SIZE (python/Python-3.7.6.tar.xz) = 17246360 +TIMESTAMP = 1583986224 +SHA256 (python/Python-3.7.7.tar.xz) = 06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136 +SIZE (python/Python-3.7.7.tar.xz) = 17268888