diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python36/Makefile | 3 | ||||
| -rw-r--r-- | lang/python36/PLIST | 3 | ||||
| -rw-r--r-- | lang/python36/distinfo | 4 | ||||
| -rw-r--r-- | lang/python36/patches/patch-Makefile.pre.in | 25 |
4 files changed, 22 insertions, 13 deletions
diff --git a/lang/python36/Makefile b/lang/python36/Makefile index 34eea0b23b0..e7bb1bda82a 100644 --- a/lang/python36/Makefile +++ b/lang/python36/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2017/11/22 18:57:05 bsiegert Exp $ +# $NetBSD: Makefile,v 1.12 2017/12/13 12:56:10 jperkin Exp $ .include "dist.mk" PKGNAME= python36-${PY_DISTVERSION} +PKGREVISION= 1 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python36/PLIST b/lang/python36/PLIST index 2ed0497ab2c..968854564fd 100644 --- a/lang/python36/PLIST +++ b/lang/python36/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2017/10/05 08:17:25 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2017/12/13 12:56:10 jperkin Exp $ bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -107,7 +107,6 @@ include/python${PY_VER_SUFFIX}/warnings.h include/python${PY_VER_SUFFIX}/weakrefobject.h lib/libpython${PY_VER_SUFFIX}.so lib/libpython${PY_VER_SUFFIX}.so.1.0 -lib/libpython3.so lib/pkgconfig/python-${PY_VER_SUFFIX}.pc lib/python${PY_VER_SUFFIX}/LICENSE.txt lib/python${PY_VER_SUFFIX}/__future__.py diff --git a/lang/python36/distinfo b/lang/python36/distinfo index 81c2b91a923..757eb23dec5 100644 --- a/lang/python36/distinfo +++ b/lang/python36/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2017/11/01 21:51:22 wiz Exp $ +$NetBSD: distinfo,v 1.16 2017/12/13 12:56:10 jperkin Exp $ SHA1 (Python-3.6.3.tar.xz) = 6c71b14bdbc4d8aa0cfd59d4b6dc356d46abfdf5 RMD160 (Python-3.6.3.tar.xz) = b29962b7233c74149670d8b83284d4265de5e769 @@ -8,7 +8,7 @@ SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee9 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c -SHA1 (patch-Makefile.pre.in) = 7d3724319c8d5a116364af0b85c1af2726bbc593 +SHA1 (patch-Makefile.pre.in) = 043fe791e021912d116800d397570d3fc201ab26 SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d diff --git a/lang/python36/patches/patch-Makefile.pre.in b/lang/python36/patches/patch-Makefile.pre.in index 9acf9fd4554..12eaca0c681 100644 --- a/lang/python36/patches/patch-Makefile.pre.in +++ b/lang/python36/patches/patch-Makefile.pre.in @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile.pre.in,v 1.3 2017/07/18 13:43:40 adam Exp $ +$NetBSD: patch-Makefile.pre.in,v 1.4 2017/12/13 12:56:10 jperkin Exp $ Use only one optimisation level; needed for PLIST and setuptools compatibility. - +Do not build/install libpython3.so. Simplify _sysconfigdata to include only platform name. ---- Makefile.pre.in.orig 2017-07-08 03:33:27.000000000 +0000 +--- Makefile.pre.in.orig 2017-10-03 05:52:02.000000000 +0000 +++ Makefile.pre.in @@ -96,7 +96,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI # be able to build extension modules using the directories specified in the @@ -15,6 +15,15 @@ Simplify _sysconfigdata to include only platform name. NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ +@@ -207,7 +207,7 @@ DIST= $(DISTFILES) $(DISTDIRS) + LIBRARY= @LIBRARY@ + LDLIBRARY= @LDLIBRARY@ + BLDLIBRARY= @BLDLIBRARY@ +-PY3LIBRARY= @PY3LIBRARY@ ++PY3LIBRARY= + DLLLIBRARY= @DLLLIBRARY@ + LDLIBRARYDIR= @LDLIBRARYDIR@ + INSTSONAME= @INSTSONAME@ @@ -431,7 +431,7 @@ LIBRARY_OBJS= \ # On some systems, object files that reference DTrace probes need to be modified # in-place by dtrace(1). @@ -48,7 +57,7 @@ Simplify _sysconfigdata to include only platform name. Objects/typeobject.o: Objects/typeslots.inc -@@ -1129,7 +1128,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK +@@ -1141,7 +1140,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK if test -n "$(PY3LIBRARY)"; then \ $(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \ fi; \ @@ -58,7 +67,7 @@ Simplify _sysconfigdata to include only platform name. fi if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)python$(VERSION)-32$(EXE); \ -@@ -1304,7 +1304,7 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1318,7 +1318,7 @@ libinstall: build_all $(srcdir)/Modules/ esac; \ done; \ done @@ -67,7 +76,7 @@ Simplify _sysconfigdata to include only platform name. $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ -@@ -1322,11 +1322,6 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1336,11 +1336,6 @@ libinstall: build_all $(srcdir)/Modules/ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ @@ -79,7 +88,7 @@ Simplify _sysconfigdata to include only platform name. $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -@@ -1335,10 +1330,6 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1349,10 +1344,6 @@ libinstall: build_all $(srcdir)/Modules/ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ @@ -90,7 +99,7 @@ Simplify _sysconfigdata to include only platform name. $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -@@ -1439,7 +1430,7 @@ sharedinstall: sharedmods +@@ -1453,7 +1444,7 @@ sharedinstall: sharedmods --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ |