Received: by mail.netbsd.org (Postfix, from userid 605) id A552784D7A; Tue, 15 Oct 2019 16:52:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C45684CF1 for ; Tue, 15 Oct 2019 16:52:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id REU5Ks3l-jXg for ; Tue, 15 Oct 2019 16:52:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 90F3C84CE9 for ; Tue, 15 Oct 2019 16:52:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8EA07FBF4; Tue, 15 Oct 2019 16:52:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1571158361171430" MIME-Version: 1.0 Date: Tue, 15 Oct 2019 16:52:41 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/python36 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20191015165241.8EA07FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1571158361171430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Oct 15 16:52:41 UTC 2019 Modified Files: pkgsrc/lang/python36: distinfo options.mk pkgsrc/lang/python36/patches: patch-configure Log Message: python36: add pymalloc option To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/python36/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python36/options.mk cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/python36/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1571158361171430 Content-Disposition: inline Content-Length: 4002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python36/distinfo diff -u pkgsrc/lang/python36/distinfo:1.27 pkgsrc/lang/python36/distinfo:1.28 --- pkgsrc/lang/python36/distinfo:1.27 Wed Jul 3 20:10:41 2019 +++ pkgsrc/lang/python36/distinfo Tue Oct 15 16:52:41 2019 @@ -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) = e6 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 Index: pkgsrc/lang/python36/options.mk diff -u pkgsrc/lang/python36/options.mk:1.3 pkgsrc/lang/python36/options.mk:1.4 --- pkgsrc/lang/python36/options.mk:1.3 Sat Mar 2 13:23:36 2019 +++ pkgsrc/lang/python36/options.mk Tue Oct 15 16:52:41 2019 @@ -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 Index: pkgsrc/lang/python36/patches/patch-configure diff -u pkgsrc/lang/python36/patches/patch-configure:1.12 pkgsrc/lang/python36/patches/patch-configure:1.13 --- pkgsrc/lang/python36/patches/patch-configure:1.12 Sat Mar 2 13:23:36 2019 +++ pkgsrc/lang/python36/patches/patch-configure Tue Oct 15 16:52:41 2019 @@ -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 "alloc 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 - >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; } --_----------=_1571158361171430--