From owner-svn-ports-head@FreeBSD.ORG Wed Oct 29 13:21:22 2014 Return-Path: Delivered-To: svn-ports-head@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 53F16FF2; Wed, 29 Oct 2014 13:21:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 259FA91A; Wed, 29 Oct 2014 13:21:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9TDLMoO035579; Wed, 29 Oct 2014 13:21:22 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9TDLMNi035578; Wed, 29 Oct 2014 13:21:22 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201410291321.s9TDLMNi035578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Wed, 29 Oct 2014 13:21:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371675 - head/lang/python34 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 13:21:22 -0000 Author: demon Date: Wed Oct 29 13:21:21 2014 New Revision: 371675 URL: https://svnweb.freebsd.org/changeset/ports/371675 QAT: https://qat.redports.org/buildarchive/r371675/ Log: Add an option to use libffi from ports instead of bundled one. Submitted by: cy Require this option for i386, this fixes build error. Modified: head/lang/python34/Makefile Modified: head/lang/python34/Makefile ============================================================================== --- head/lang/python34/Makefile Wed Oct 29 11:37:17 2014 (r371674) +++ head/lang/python34/Makefile Wed Oct 29 13:21:21 2014 (r371675) @@ -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 @@ MAKE_ARGS+= LIBPC="${PREFIX}/libdata/pk 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 @@ 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 HASH_DESC= Hash Algorithm (PEP-456) FNV_DESC= Modified Fowler-Noll-Vo Algorithm @@ -78,6 +80,15 @@ ABIFLAGS:= m${ABIFLAGS} ABIFLAGS:= d${ABIFLAGS} .endif +.if ${PORT_OPTIONS:MPORT_FFI} +CONFIGURE_ARGS+= --with-system-ffi +LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi +.else +.if ${ARCH} == i386 +BROKEN= You must use libffi from ports on i386 +.endif +.endif + .if !empty(ABIFLAGS) PLIST_FILES+= bin/python3.4%%ABI%% PLIST_FILES+= bin/python3.4%%ABI%%-config