diff options
| author | Wen Heping <wen@FreeBSD.org> | 2019-01-01 08:48:18 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2019-01-01 08:48:18 +0000 |
| commit | bbc317680dab045cbc22544d9ed4aec719d90633 (patch) | |
| tree | c5159e19b7258958b16805feb59c4ed514efaba2 /lang/python36 | |
| parent | 48386559b9a867dcdc4f191eb4ca41c67eecd4d7 (diff) | |
| download | ports-bbc317680dab045cbc22544d9ed4aec719d90633.tar.gz ports-bbc317680dab045cbc22544d9ed4aec719d90633.zip | |
Notes
Diffstat (limited to 'lang/python36')
| -rw-r--r-- | lang/python36/Makefile.version | 2 | ||||
| -rw-r--r-- | lang/python36/distinfo | 6 | ||||
| -rw-r--r-- | lang/python36/files/patch-Makefile.pre.in | 28 | ||||
| -rw-r--r-- | lang/python36/pkg-plist | 8 |
4 files changed, 15 insertions, 29 deletions
diff --git a/lang/python36/Makefile.version b/lang/python36/Makefile.version index 64909037be15..79ebc80984e6 100644 --- a/lang/python36/Makefile.version +++ b/lang/python36/Makefile.version @@ -1,4 +1,4 @@ # Mk/Uses/python.mk includes this file, don't remove it! # $FreeBSD$ -PYTHON_PORTVERSION= 3.6.7 +PYTHON_PORTVERSION= 3.6.8 diff --git a/lang/python36/distinfo b/lang/python36/distinfo index 7ca3f11fc99b..94fb89a76a46 100644 --- a/lang/python36/distinfo +++ b/lang/python36/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540096878 -SHA256 (python/Python-3.6.7.tar.xz) = 81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d -SIZE (python/Python-3.6.7.tar.xz) = 17178476 +TIMESTAMP = 1545693407 +SHA256 (python/Python-3.6.8.tar.xz) = 35446241e995773b1bed7d196f4b624dadcadc8429f26282e756b2fb8a351193 +SIZE (python/Python-3.6.8.tar.xz) = 17212420 diff --git a/lang/python36/files/patch-Makefile.pre.in b/lang/python36/files/patch-Makefile.pre.in index 117a6bb12721..28d386521c29 100644 --- a/lang/python36/files/patch-Makefile.pre.in +++ b/lang/python36/files/patch-Makefile.pre.in @@ -6,9 +6,9 @@ # Submitted by: antoine@ (r358029) # TODO: Upstream ---- Makefile.pre.in.orig 2016-12-26 00:30:30.873942000 +0800 -+++ Makefile.pre.in 2016-12-26 02:51:45.233175000 +0800 -@@ -80,23 +80,20 @@ +--- Makefile.pre.in.orig 2018-12-25 07:28:06 UTC ++++ Makefile.pre.in +@@ -79,7 +79,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ BASECPPFLAGS= @BASECPPFLAGS@ @@ -16,7 +16,10 @@ # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. # Use it when a compiler flag should _not_ be part of the distutils CFLAGS # once Python is installed (Issue #21121). - CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ +@@ -88,18 +87,16 @@ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ + # Use it when a linker flag should _not_ be part of the distutils LDFLAGS + # once Python is installed (bpo-35257) + CONFIGURE_LDFLAGS_NODIST=@LDFLAGS_NODIST@ -CONFIGURE_CPPFLAGS= @CPPFLAGS@ -CONFIGURE_LDFLAGS= @LDFLAGS@ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the @@ -32,23 +35,10 @@ -PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS) +PY_LDFLAGS= $(LDFLAGS) + PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ - SGI_ABI= @SGI_ABI@ -@@ -1145,12 +1142,6 @@ - else true; \ - fi - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) -- -if test "$(VERSION)" != "$(LDVERSION)"; then \ -- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ -- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ -- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ -- fi - -rm -f $(DESTDIR)$(BINDIR)/python3-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) - -rm -f $(DESTDIR)$(LIBPC)/python3.pc -@@ -1412,6 +1403,12 @@ +@@ -1451,6 +1448,12 @@ libainstall: @DEF_MAKE_RULE@ python-config $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config diff --git a/lang/python36/pkg-plist b/lang/python36/pkg-plist index 782aeb4e3d3d..8352405c6d61 100644 --- a/lang/python36/pkg-plist +++ b/lang/python36/pkg-plist @@ -2112,8 +2112,8 @@ lib/python%%XYDOT%%/ensurepip/__pycache__/__main__.cpython-%%XY%%.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-1.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.opt-2.pyc lib/python%%XYDOT%%/ensurepip/__pycache__/_uninstall.cpython-%%XY%%.pyc -lib/python%%XYDOT%%/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl -lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl +lib/python%%XYDOT%%/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl lib/python%%XYDOT%%/ensurepip/_uninstall.py lib/python%%XYDOT%%/enum.py lib/python%%XYDOT%%/filecmp.py @@ -5287,10 +5287,6 @@ lib/python%%XYDOT%%/test/test_asyncio/__pycache__/test_windows_utils.cpython-%%X lib/python%%XYDOT%%/test/test_asyncio/echo.py lib/python%%XYDOT%%/test/test_asyncio/echo2.py lib/python%%XYDOT%%/test/test_asyncio/echo3.py -lib/python%%XYDOT%%/test/test_asyncio/keycert3.pem -lib/python%%XYDOT%%/test/test_asyncio/pycacert.pem -lib/python%%XYDOT%%/test/test_asyncio/ssl_cert.pem -lib/python%%XYDOT%%/test/test_asyncio/ssl_key.pem lib/python%%XYDOT%%/test/test_asyncio/test_base_events.py lib/python%%XYDOT%%/test/test_asyncio/test_events.py lib/python%%XYDOT%%/test/test_asyncio/test_futures.py |