Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Oct 2014 13:21:22 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371675 - head/lang/python34
Message-ID:  <201410291321.s9TDLMNi035578@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410291321.s9TDLMNi035578>