MFH: r461514
Update to 3.5.5 - Update Makefile and PLIST to be similar with python36 - Sort USES - Remove CPE_*: all of them are default values - Update PLIST_FILES: do not use %% - Remove over-patched shebang fix of Lib/cgi.py - Update http:// links in Makefile comments and patch files Changes: https://docs.python.org/3.5/whatsnew/changelog.html Security: 0fe70bcd-2ce3-46c9-a64b-4a7da097db07 Approved by: ports-secteam (riggs)
This commit is contained in:
Sunpoet Po-Chuan Hsieh
parent
f10e8bdd15
commit
b5dca6752d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q1/; revision=461596
5 changed files with 33 additions and 29 deletions
|
|
@ -4,9 +4,9 @@
|
|||
PORTNAME= python
|
||||
PORTVERSION= ${PYTHON_PORTVERSION}
|
||||
CATEGORIES= lang python ipv6
|
||||
MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION}
|
||||
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
|
||||
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
|
||||
DISTNAME= Python-${DISTVERSION}
|
||||
DISTNAME= Python-${PORTVERSION}
|
||||
DIST_SUBDIR= python
|
||||
|
||||
MAINTAINER= python@FreeBSD.org
|
||||
|
|
@ -16,17 +16,13 @@ LICENSE= PSFL
|
|||
|
||||
BROKEN_SSL= openssl-devel
|
||||
|
||||
USES= cpe ncurses pathfix pkgconfig readline:port ssl tar:xz shebangfix
|
||||
USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
|
||||
PATHFIX_MAKEFILEIN= Makefile.pre.in
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R}
|
||||
SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
|
||||
|
||||
CPE_VENDOR= python
|
||||
CPE_PRODUCT= ${CPE_VENDOR}
|
||||
CPE_VERSION= ${DISTVERSION}
|
||||
|
||||
# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
|
||||
PYTHON_VER= ${PYTHON_PORTVERSION:R}
|
||||
PYTHON_VERSION= python${PYTHON_VER}
|
||||
|
|
@ -47,9 +43,11 @@ MAKE_JOBS_UNSAFE= yes # Parser/pgen build bug. See Issue: 200622, 201974
|
|||
SUB_FILES= pkg-message
|
||||
SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX}
|
||||
|
||||
PLIST_SUB= XYDOT=${PYTHON_VER} XY=${PYTHON_SUFFIX} \
|
||||
XYZDOT=${PYTHON_PORTVERSION} ABI=${ABIFLAGS} \
|
||||
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
|
||||
PLIST_SUB= ABI=${ABIFLAGS} \
|
||||
XY=${PYTHON_SUFFIX} \
|
||||
XYDOT=${PYTHON_VER} \
|
||||
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 THREADS TSC
|
||||
OPTIONS_DEFAULT= LIBFFI PYMALLOC THREADS
|
||||
|
|
@ -77,7 +75,7 @@ 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: http://bugs.python.org/issue6299
|
||||
# Upstream Issue: https://bugs.python.org/issue6299
|
||||
NLS_USES= gettext
|
||||
NLS_CPPFLAGS= -I${LOCALBASE}/include
|
||||
NLS_LIBS= -L${LOCALBASE}/lib -lintl
|
||||
|
|
@ -102,13 +100,13 @@ ABIFLAGS:= d${ABIFLAGS}
|
|||
.endif
|
||||
|
||||
.if !empty(ABIFLAGS)
|
||||
PLIST_FILES+= bin/python%%XYDOT%%%%ABI%%
|
||||
PLIST_FILES+= bin/python%%XYDOT%%%%ABI%%-config
|
||||
PLIST_FILES+= libdata/pkgconfig/python-%%XYDOT%%%%ABI%%.pc
|
||||
PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} \
|
||||
bin/python${PYTHON_VER}${ABIFLAGS}-config \
|
||||
libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc
|
||||
.endif
|
||||
|
||||
# http://bugs.python.org/issue22521
|
||||
# http://bugs.python.org/issue23042
|
||||
# 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
|
||||
|
|
@ -117,7 +115,7 @@ BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option
|
|||
CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900
|
||||
.endif
|
||||
|
||||
# See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
|
||||
# See https://bugs.freebsd.org/115940 and https://bugs.freebsd.org/193650
|
||||
.if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
|
||||
PLIST_SUB+= NO_NIS="@comment "
|
||||
DISABLED_EXTENSIONS+= nis
|
||||
|
|
@ -133,15 +131,11 @@ post-patch:
|
|||
"s|lib_dirs,\ \'readline\'|[\'${LOCALBASE}/lib\',\ \'.\'],\ \'readline\'|" \
|
||||
${WRKSRC}/setup.py
|
||||
.endif
|
||||
${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
|
||||
${WRKSRC}/Lib/cgi.py
|
||||
|
||||
post-install:
|
||||
.if ! ${PORT_OPTIONS:MDEBUG}
|
||||
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http://bugs.python.org/issue17975
|
||||
${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975
|
||||
.endif
|
||||
for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
|
||||
${STRIP_CMD} $$i; done # Strip shared extensions
|
||||
# This code block exists for the qemu-user enabled cross build environment.
|
||||
# When using this environment in poudriere, CC is not set to the default
|
||||
# of /usr/bin/cc and a cross-compile toolchain is used. We need to hand
|
||||
|
|
@ -149,10 +143,12 @@ post-install:
|
|||
# FreeBSD base system provides. sbruno 02Aug2017
|
||||
.if ${CC} == /nxb-bin/usr/bin/cc
|
||||
@${REINPLACE_CMD} -e 's=/nxb-bin==' \
|
||||
${STAGEDIR}${PREFIX}/lib/python3.5/_sysconfigdata.py
|
||||
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata.py
|
||||
@${REINPLACE_CMD} -e 's=/nxb-bin==' \
|
||||
${STAGEDIR}${PREFIX}/lib/python3.5/config-3.5m/Makefile
|
||||
${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}m/Makefile
|
||||
.endif
|
||||
for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \
|
||||
${STRIP_CMD} $$i; done # Strip shared extensions
|
||||
${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
|
||||
${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Mk/Uses/python.mk includes this file, don't remove it!
|
||||
# $FreeBSD$
|
||||
|
||||
PYTHON_PORTVERSION= 3.5.4
|
||||
PYTHON_PORTVERSION= 3.5.5
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1502303619
|
||||
SHA256 (python/Python-3.5.4.tar.xz) = 94d93bfabb3b109f8a10365a325f920f9ec98c6e2380bf228f9700a14054c84c
|
||||
SIZE (python/Python-3.5.4.tar.xz) = 15332320
|
||||
TIMESTAMP = 1518278398
|
||||
SHA256 (python/Python-3.5.5.tar.xz) = 063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
|
||||
SIZE (python/Python-3.5.5.tar.xz) = 15351440
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Backport patch 0001 from Issue #20210
|
||||
# Issue: http://bugs.python.org/issue20210
|
||||
# Issue: https://bugs.python.org/issue20210
|
||||
# By: Thomas Petazzoni
|
||||
|
||||
--- ./Makefile.pre.in.orig 2014-03-24 22:45:17.908886504 +1100
|
||||
|
|
|
|||
|
|
@ -5383,6 +5383,14 @@ lib/python%%XYDOT%%/test/test_import/data/circular_imports/subpkg/__pycache__/ut
|
|||
lib/python%%XYDOT%%/test/test_import/data/circular_imports/subpkg/subpackage2.py
|
||||
lib/python%%XYDOT%%/test/test_import/data/circular_imports/subpkg/util.py
|
||||
lib/python%%XYDOT%%/test/test_import/data/circular_imports/util.py
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule1.cpython-%%XY%%.opt-1.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule1.cpython-%%XY%%.opt-2.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule1.cpython-%%XY%%.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule2.cpython-%%XY%%.opt-1.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule2.cpython-%%XY%%.opt-2.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/__pycache__/submodule2.cpython-%%XY%%.pyc
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/submodule1.py
|
||||
lib/python%%XYDOT%%/test/test_import/data/package2/submodule2.py
|
||||
lib/python%%XYDOT%%/test/test_importlib/__init__.py
|
||||
lib/python%%XYDOT%%/test/test_importlib/__main__.py
|
||||
lib/python%%XYDOT%%/test/test_importlib/__pycache__/__init__.cpython-%%XY%%.opt-1.pyc
|
||||
|
|
|
|||
Loading…
Reference in a new issue