Mon Dec 7 13:14:39 2020 UTC ()
python*: Revert shm_open workaround now it's fixed in mksandbox


(nia)
diff -r1.92 -r1.93 pkgsrc/lang/python27/Makefile
diff -r1.29 -r1.30 pkgsrc/lang/python36/Makefile
diff -r1.24 -r1.25 pkgsrc/lang/python37/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/python38/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/python39/Makefile
cvs diff -r1.92 -r1.93 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2020/12/06 11:35:31 1.92
+++ pkgsrc/lang/python27/Makefile 2020/12/07 13:14:38 1.93
@@ -1,42 +1,38 @@ @@ -1,42 +1,38 @@
1# $NetBSD: Makefile,v 1.92 2020/12/06 11:35:31 nia Exp $ 1# $NetBSD: Makefile,v 1.93 2020/12/07 13:14:38 nia Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python27-${PY_DISTVERSION} 5PKGNAME= python27-${PY_DISTVERSION}
6PKGREVISION= 3 6PKGREVISION= 3
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts 14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
15 15
16CONFLICTS+= python-[0-9]* 16CONFLICTS+= python-[0-9]*
17 17
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --enable-shared 20CONFIGURE_ARGS+= --enable-shared
21CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb 21CONFIGURE_ARGS+= --with-dbmliborder=ndbm:bdb
22CONFIGURE_ARGS+= --with-system-ffi 22CONFIGURE_ARGS+= --with-system-ffi
23CONFIGURE_ARGS+= --with-threads 23CONFIGURE_ARGS+= --with-threads
24CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} 24CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
25CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q} 25CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
26# If the build sandbox doesn't have /dev/shm mounted, don't produce 
27# broken packages. 
28CONFIGURE_ENV.Linux+= ac_cv_posix_semaphores_enabled=yes 
29CONFIGURE_ENV.Linux+= ac_cv_broken_sem_getvalue=no 
30PKGCONFIG_OVERRIDE+= Misc/python.pc.in 26PKGCONFIG_OVERRIDE+= Misc/python.pc.in
31 27
32LDFLAGS+= -L${WRKSRC} 28LDFLAGS+= -L${WRKSRC}
33 29
34# $RANDOM usage there is fine 30# $RANDOM usage there is fine
35CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh 31CHECK_PORTABILITY_SKIP= Tools/faqwiz/move-faqwiz.sh
36 32
37PTHREAD_OPTS+= require 33PTHREAD_OPTS+= require
38PTHREAD_AUTO_VARS= yes 34PTHREAD_AUTO_VARS= yes
39.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
40.if ${PTHREAD_TYPE} == "pth" 36.if ${PTHREAD_TYPE} == "pth"
41CONFIGURE_ARGS+= --with-pth 37CONFIGURE_ARGS+= --with-pth
42.endif 38.endif
cvs diff -r1.29 -r1.30 pkgsrc/lang/python36/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python36/Attic/Makefile 2020/12/06 11:35:31 1.29
+++ pkgsrc/lang/python36/Attic/Makefile 2020/12/07 13:14:38 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2020/12/06 11:35:31 nia Exp $ 1# $NetBSD: Makefile,v 1.30 2020/12/07 13:14:38 nia Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python36-${PY_DISTVERSION} 5PKGNAME= python36-${PY_DISTVERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -19,30 +19,26 @@ PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py @@ -19,30 +19,26 @@ PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py
19PRINT_PLIST_AWK+= sub(/__pycache__\//, "") 19PRINT_PLIST_AWK+= sub(/__pycache__\//, "")
20PRINT_PLIST_AWK+= sub(/\.cpython-36/, "")} 20PRINT_PLIST_AWK+= sub(/\.cpython-36/, "")}
21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ { 21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")} 22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")}
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --enable-shared 26CONFIGURE_ARGS+= --enable-shared
27CONFIGURE_ARGS+= --with-system-ffi 27CONFIGURE_ARGS+= --with-system-ffi
28CONFIGURE_ARGS+= --with-threads 28CONFIGURE_ARGS+= --with-threads
29CONFIGURE_ARGS+= --without-ensurepip 29CONFIGURE_ARGS+= --without-ensurepip
30CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q} 30CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
31CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir} 31CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
32# If the build sandbox doesn't have /dev/shm mounted, don't produce 
33# broken packages. 
34CONFIGURE_ENV.Linux+= ac_cv_posix_semaphores_enabled=yes 
35CONFIGURE_ENV.Linux+= ac_cv_broken_sem_getvalue=no 
36PKGCONFIG_OVERRIDE+= Misc/python.pc.in 32PKGCONFIG_OVERRIDE+= Misc/python.pc.in
37 33
38PTHREAD_OPTS+= require 34PTHREAD_OPTS+= require
39.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
40 36
41.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
42 38
43# http://bugs.python.org/issue13241 39# http://bugs.python.org/issue13241
44.if !empty(MACHINE_PLATFORM:MDarwin-10.*) 40.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
45PKGSRC_COMPILER= clang 41PKGSRC_COMPILER= clang
46PKG_CC= clang 42PKG_CC= clang
47PKG_CXX= clang++ 43PKG_CXX= clang++
48.endif 44.endif
cvs diff -r1.24 -r1.25 pkgsrc/lang/python37/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python37/Makefile 2020/12/06 11:35:31 1.24
+++ pkgsrc/lang/python37/Makefile 2020/12/07 13:14:38 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2020/12/06 11:35:31 nia Exp $ 1# $NetBSD: Makefile,v 1.25 2020/12/07 13:14:38 nia Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python37-${PY_DISTVERSION} 5PKGNAME= python37-${PY_DISTVERSION}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -19,30 +19,26 @@ PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py @@ -19,30 +19,26 @@ PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py
19PRINT_PLIST_AWK+= sub(/__pycache__\//, "") 19PRINT_PLIST_AWK+= sub(/__pycache__\//, "")
20PRINT_PLIST_AWK+= sub(/\.cpython-37/, "")} 20PRINT_PLIST_AWK+= sub(/\.cpython-37/, "")}
21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ { 21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")} 22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")}
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --enable-shared 26CONFIGURE_ARGS+= --enable-shared
27CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 27CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
28CONFIGURE_ARGS+= --with-system-ffi 28CONFIGURE_ARGS+= --with-system-ffi
29CONFIGURE_ARGS+= --without-ensurepip 29CONFIGURE_ARGS+= --without-ensurepip
30CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q} 30CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
31CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir} 31CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
32# If the build sandbox doesn't have /dev/shm mounted, don't produce 
33# broken packages. 
34CONFIGURE_ENV.Linux+= ac_cv_posix_semaphores_enabled=yes 
35CONFIGURE_ENV.Linux+= ac_cv_broken_sem_getvalue=no 
36PKGCONFIG_OVERRIDE+= Misc/python.pc.in 32PKGCONFIG_OVERRIDE+= Misc/python.pc.in
37 33
38PTHREAD_OPTS+= require 34PTHREAD_OPTS+= require
39.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
40 36
41.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
42 38
43# http://bugs.python.org/issue13241 39# http://bugs.python.org/issue13241
44.if !empty(MACHINE_PLATFORM:MDarwin-10.*) 40.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
45PKGSRC_COMPILER?= clang 41PKGSRC_COMPILER?= clang
46PKG_CC= clang 42PKG_CC= clang
47PKG_CXX= clang++ 43PKG_CXX= clang++
48.endif 44.endif
cvs diff -r1.16 -r1.17 pkgsrc/lang/python38/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python38/Makefile 2020/12/06 11:35:31 1.16
+++ pkgsrc/lang/python38/Makefile 2020/12/07 13:14:38 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2020/12/06 11:35:31 nia Exp $ 1# $NetBSD: Makefile,v 1.17 2020/12/07 13:14:38 nia Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python38-${PY_DISTVERSION} 5PKGNAME= python38-${PY_DISTVERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -20,30 +20,26 @@ PRINT_PLIST_AWK+= sub(/__pycache__\//, " @@ -20,30 +20,26 @@ PRINT_PLIST_AWK+= sub(/__pycache__\//, "
20PRINT_PLIST_AWK+= sub(/\.cpython-38/, "")} 20PRINT_PLIST_AWK+= sub(/\.cpython-38/, "")}
21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ { 21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")} 22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")}
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_TOOLS+= pkg-config 25USE_TOOLS+= pkg-config
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --enable-shared 27CONFIGURE_ARGS+= --enable-shared
28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
29CONFIGURE_ARGS+= --with-system-ffi 29CONFIGURE_ARGS+= --with-system-ffi
30CONFIGURE_ARGS+= --without-ensurepip 30CONFIGURE_ARGS+= --without-ensurepip
31CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q} 31CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
32CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir} 32CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
33# If the build sandbox doesn't have /dev/shm mounted, don't produce 
34# broken packages. 
35CONFIGURE_ENV.Linux+= ac_cv_posix_semaphores_enabled=yes 
36CONFIGURE_ENV.Linux+= ac_cv_broken_sem_getvalue=no 
37PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in 33PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
38 34
39PTHREAD_OPTS+= require 35PTHREAD_OPTS+= require
40.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
41 37
42.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
43 39
44# http://bugs.python.org/issue13241 40# http://bugs.python.org/issue13241
45.if !empty(MACHINE_PLATFORM:MDarwin-10.*) 41.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
46PKGSRC_COMPILER= clang 42PKGSRC_COMPILER= clang
47PKG_CC= clang 43PKG_CC= clang
48PKG_CXX= clang++ 44PKG_CXX= clang++
49.endif 45.endif
cvs diff -r1.4 -r1.5 pkgsrc/lang/python39/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python39/Makefile 2020/12/06 11:35:31 1.4
+++ pkgsrc/lang/python39/Makefile 2020/12/07 13:14:39 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2020/12/06 11:35:31 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2020/12/07 13:14:39 nia Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python39-${PY_DISTVERSION} 5PKGNAME= python39-${PY_DISTVERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
@@ -20,30 +20,26 @@ PRINT_PLIST_AWK+= sub(/__pycache__\//, " @@ -20,30 +20,26 @@ PRINT_PLIST_AWK+= sub(/__pycache__\//, "
20PRINT_PLIST_AWK+= sub(/\.cpython-39/, "")} 20PRINT_PLIST_AWK+= sub(/\.cpython-39/, "")}
21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ { 21PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.opt-1.pyc$$/ {
22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")} 22PRINT_PLIST_AWK+= sub(/.opt-[12].pyc$$/, ".pyo")}
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_TOOLS+= pkg-config 25USE_TOOLS+= pkg-config
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --enable-shared 27CONFIGURE_ARGS+= --enable-shared
28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 28CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
29CONFIGURE_ARGS+= --with-system-ffi 29CONFIGURE_ARGS+= --with-system-ffi
30CONFIGURE_ARGS+= --without-ensurepip 30CONFIGURE_ARGS+= --without-ensurepip
31CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q} 31CONFIGURE_ENV+= OPT=${CFLAGS:M*:Q}
32CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir} 32CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
33# If the build sandbox doesn't have /dev/shm mounted, don't produce 
34# broken packages. 
35CONFIGURE_ENV.Linux+= ac_cv_posix_semaphores_enabled=yes 
36CONFIGURE_ENV.Linux+= ac_cv_broken_sem_getvalue=no 
37PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in 33PKGCONFIG_OVERRIDE+= Misc/python.pc.in Misc/python-embed.pc.in
38 34
39PTHREAD_OPTS+= require 35PTHREAD_OPTS+= require
40.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
41 37
42.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
43 39
44# http://bugs.python.org/issue13241 40# http://bugs.python.org/issue13241
45.if !empty(MACHINE_PLATFORM:MDarwin-10.*) 41.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
46PKGSRC_COMPILER= clang 42PKGSRC_COMPILER= clang
47PKG_CC= clang 43PKG_CC= clang
48PKG_CXX= clang++ 44PKG_CXX= clang++
49.endif 45.endif