From owner-freebsd-python@FreeBSD.ORG Tue Oct 28 05:01:09 2014 Return-Path: Delivered-To: freebsd-python@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 425595C4; Tue, 28 Oct 2014 05:01:09 +0000 (UTC) Received: from smtp-out-02.shaw.ca (smtp-out-03.shaw.ca [64.59.136.139]) by mx1.freebsd.org (Postfix) with ESMTP id D1F25D92; Tue, 28 Oct 2014 05:01:08 +0000 (UTC) X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=ryrf5q5p6c4dCQYR2lAej91p2ozDt6sfPnRAuS/Q8hc= c=1 sm=1 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=flWBhW-0fR7Puda0LS4A:9 a=CjuIK1q_8ugA:10 a=hZ8tZfcf6NoA:10 a=nnZlOU1YgLkA:10 a=8AHkEIZyAAAA:8 a=6I5d2MoRAAAA:8 a=y3KrW50VgGga0LA8kFQA:9 a=BWvPGDcYAAAA:8 a=vZoGgzP0pyKfTN_ogUkA:9 a=w3VIBR3K5DEA:10 a=rh0Q7tNTUcUA:10 a=vXdFDvSJeccA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by smtp-out-02.shaw.ca with ESMTP; 27 Oct 2014 23:01:01 -0600 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0A0EB9BEA; Mon, 27 Oct 2014 22:01:01 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.9/8.14.9) with ESMTP id s9S5104o025207; Mon, 27 Oct 2014 22:01:00 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.14.9/8.14.8/Submit) with ESMTP id s9S510vl025204; Mon, 27 Oct 2014 22:01:00 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201410280501.s9S510vl025204@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: freebsd-ports@freebsd.org, freebsd-python@freebsd.org Subject: Libffi Dependency Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_1414470413_43760" Date: Mon, 27 Oct 2014 22:01:00 -0700 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2014 05:01:09 -0000 This is a multipart MIME message. --==_Exmh_1414470413_43760 Content-Type: text/plain; charset=us-ascii Hi, Would anyone care to check this out and would anyone object to this being committed? Basically this enables optional (default) dependency on devel/libffi instead of libffi shipped within the python tarballs. The default is to use devel/libffi however the user can opt to use the ffi delivered with each python tarball. Comments? Ojbections? --==_Exmh_1414470413_43760 Content-Type: text/plain ; name="python.diff"; charset=us-ascii Content-Description: python.diff Content-Disposition: attachment; filename="python.diff" Index: python27/Makefile =================================================================== --- python27/Makefile (revision 371618) +++ python27/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= python27 PORTVERSION= 2.7.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} @@ -34,8 +34,8 @@ PORTVERSION=${PORTVERSION} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC SEM THREADS -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC SEM THREADS UCS4 +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC SEM THREADS PORT_FFI +OPTIONS_DEFAULT= IPV6 NLS PYMALLOC SEM THREADS UCS4 PORT_FFI OPTIONS_SINGLE= UNICODE OPTIONS_SINGLE_UNICODE= UCS2 UCS4 @@ -45,6 +45,7 @@ UCS2_DESC= Enable UCS2 Unicode Strings UCS4_DESC= Enable UCS4 Unicode Strings PYMALLOC_DESC= Enable specialized mallocs +PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 @@ -88,6 +89,12 @@ CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if ${PORT_OPTIONS:MPORT_FFI} +CONFIGURE_ARGS+= --with-system-ffi +BUILD_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +RUN_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +.endif + # See http://bugs.freebsd.org/115940 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS) # the world with NO_NIS PLIST_SUB+= NO_NIS="@comment " Index: python32/Makefile =================================================================== --- python32/Makefile (revision 371618) +++ python32/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} @@ -33,13 +33,15 @@ PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC UCS4 -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS UCS4 +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC PORT_FFI +OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS PORT_FFI + OPTIONS_SUB= yes NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs TSC_DESC= Enable processor timestamp counter profiling +PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 @@ -75,6 +77,12 @@ ABIFLAGS:= d${ABIFLAGS} .endif +.if ${PORT_OPTIONS:MPORT_FFI} +CONFIGURE_ARGS+= --with-system-ffi +BUILD_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +RUN_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +.endif + .if !empty(ABIFLAGS) PLIST_FILES+= bin/python3.2%%ABI%% PLIST_FILES+= bin/python3.2%%ABI%%-config Index: python33/Makefile =================================================================== --- python33/Makefile (revision 371618) +++ python33/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} @@ -33,13 +33,15 @@ PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC PORT_FFI +OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS PORT_FFI + OPTIONS_SUB= yes NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs TSC_DESC= Enable processor timestamp counter profiling +PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 @@ -69,6 +71,12 @@ ABIFLAGS:= d${ABIFLAGS} .endif +.if ${PORT_OPTIONS:MPORT_FFI} +CONFIGURE_ARGS+= --with-system-ffi +BUILD_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +RUN_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +.endif + .if !empty(ABIFLAGS) PLIST_FILES+= bin/python3.3%%ABI%% PLIST_FILES+= bin/python3.3%%ABI%%-config Index: python34/Makefile =================================================================== --- python34/Makefile (revision 371618) +++ python34/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= python34 PORTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} @@ -34,8 +35,8 @@ PLIST_SUB= ABI=${ABIFLAGS} \ OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554 -OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS +OPTIONS_DEFINE= DEBUG IPV6 NLS PYMALLOC THREADS TSC PORT_FFI +OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS PORT_FFI OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes @@ -43,6 +44,7 @@ NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs TSC_DESC= Enable processor timestamp counter profiling +PORT_FFI_DESC= Use devel/ffi instead of ffi bundled with Python HASH_DESC= Hash Algorithm (PEP-456) FNV_DESC= Modified Fowler-Noll-Vo Algorithm @@ -78,6 +80,12 @@ ABIFLAGS:= d${ABIFLAGS} .endif +.if ${PORT_OPTIONS:MPORT_FFI} +CONFIGURE_ARGS+= --with-system-ffi +BUILD_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +RUN_DEPENDS+= libffi>=0:${PORTSDIR}/devel/libffi +.endif + .if !empty(ABIFLAGS) PLIST_FILES+= bin/python3.4%%ABI%% PLIST_FILES+= bin/python3.4%%ABI%%-config --==_Exmh_1414470413_43760 Content-Type: text/plain; charset=us-ascii Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. --==_Exmh_1414470413_43760--