python36: add pymalloc option

3 files changed, 25 insertions, 9 deletions

diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index 08192d30239..e48dd54b2e5 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2019/07/03 20:10:41 adam Exp $
+$NetBSD: distinfo,v 1.28 2019/10/15 16:52:41 adam Exp $
 
 SHA1 (Python-3.6.9.tar.xz) = 3cd8b0e814b753fcce4fdf7edc823d8fb0da9208
 RMD160 (Python-3.6.9.tar.xz) = 3ccbe94ae221ccfb03fcd97840149a89b7135bc0
@@ -16,6 +16,6 @@ SHA1 (patch-Modules_socketmodule.c) = e6bdb8990cd9b8cf0b0ff48e6ae7b664681a9924
 SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
 SHA1 (patch-Python_pylifecycle.c) = 1d37ea6c223b935e5ce6120ae017b635cd6ab34e
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = 2c2f3e4bb0da0232f7c0c7eeae1eee782b06dd01
+SHA1 (patch-configure) = 21e9656ea48550223f0963d78d077ba62b19a9b6
 SHA1 (patch-pyconfig.h.in) = 58e2c03489f9b6e4d88f144d8c09773f92eacd61
 SHA1 (patch-setup.py) = 56851b30c8a1538012e7c78e7d33af25da5f7db4
diff --git a/lang/python36/options.mk b/lang/python36/options.mk
index 5f5e36bfe20..e44fc999346 100644
--- a/lang/python36/options.mk
+++ b/lang/python36/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2019/03/02 13:23:36 adam Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/15 16:52:41 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.python36
-PKG_SUPPORTED_OPTIONS=	dtrace x11
+PKG_SUPPORTED_OPTIONS=	dtrace pymalloc x11
 PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.prefs.mk"
@@ -33,3 +33,9 @@ SUBST_STAGE.cdlopen=	pre-configure
 SUBST_FILES.cdlopen=	setup.py
 SUBST_SED.cdlopen=	-e "s!\(libraries=\[\],\)!\1 runtime_library_dirs=\['${X11BASE}/lib'\],!"
 .endif
+
+.if !empty(PKG_OPTIONS:Mpymalloc)
+CONFIGURE_ARGS+=	--with-pymalloc
+.else
+CONFIGURE_ARGS+=	--without-pymalloc
+.endif
diff --git a/lang/python36/patches/patch-configure b/lang/python36/patches/patch-configure
index b4bc2bc3e9c..7ffc938f77e 100644
--- a/lang/python36/patches/patch-configure
+++ b/lang/python36/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.12 2019/03/02 13:23:36 adam Exp $
+$NetBSD: patch-configure,v 1.13 2019/10/15 16:52:41 adam Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -13,7 +13,9 @@ Use gnu99 instead of c99 to avoid "alloca() undefined" problems on macppc.
 
 detect netcan/can.h on NetBSD
 
---- configure.orig	2018-12-23 21:37:14.000000000 +0000
+Do not change ABIFLAGS for --with-pymalloc (as in Python 3.8).
+
+--- configure.orig	2019-07-02 20:25:39.000000000 +0000
 +++ configure
 @@ -2932,7 +2932,7 @@ $as_echo_n "checking for python interpre
  	fi
@@ -120,7 +122,15 @@ detect netcan/can.h on NetBSD
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
-@@ -11333,7 +11335,7 @@ if ${ac_cv_dtrace_link+:} false; then :
+@@ -11216,7 +11218,6 @@ then
+ 
+ $as_echo "#define WITH_PYMALLOC 1" >>confdefs.h
+ 
+-    ABIFLAGS="${ABIFLAGS}m"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
+ $as_echo "$with_pymalloc" >&6; }
+@@ -11333,7 +11334,7 @@ if ${ac_cv_dtrace_link+:} false; then :
    $as_echo_n "(cached) " >&6
  else
                ac_cv_dtrace_link=no
@@ -129,7 +139,7 @@ detect netcan/can.h on NetBSD
              "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
                  ac_cv_dtrace_link=yes
  
-@@ -15177,8 +15179,6 @@ $as_echo "$SOABI" >&6; }
+@@ -15177,8 +15178,6 @@ $as_echo "$SOABI" >&6; }
  
  
  case $ac_sys_system in
@@ -138,7 +148,7 @@ detect netcan/can.h on NetBSD
      *)
  	EXT_SUFFIX=${SHLIB_SUFFIX};;
  esac
-@@ -15190,11 +15190,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
+@@ -15190,11 +15189,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  $as_echo "$LDVERSION" >&6; }