Date: Wed, 11 Feb 2015 08:23:13 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378821 - head/lang/python34 Message-ID: <201502110823.t1B8NDYg045019@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Wed Feb 11 08:23:13 2015 New Revision: 378821 URL: https://svnweb.freebsd.org/changeset/ports/378821 QAT: https://qat.redports.org/buildarchive/r378821/ Log: lang/python34: BROKEN on i386 without LIBFFI As per lang/python27 (r377581): - Add BROKEN for i386 without LIBFFI option, and add upstream issue references. While I'm here, clean up after the LIBFFI option addition: - Sort options variables: OPTIONS_* and *_DESC - Use OPTIONS helpers - Reduce diffs between lang/python* ports Modified: head/lang/python34/Makefile Modified: head/lang/python34/Makefile ============================================================================== --- head/lang/python34/Makefile Wed Feb 11 08:22:29 2015 (r378820) +++ head/lang/python34/Makefile Wed Feb 11 08:23:13 2015 (r378821) @@ -35,16 +35,16 @@ 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 LIBFFI -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS LIBFFI +OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC +OPTIONS_DEFAULT= IPV6 LIBFFI NLS PYMALLOC THREADS OPTIONS_RADIO= HASH OPTIONS_RADIO_HASH= FNV SIPHASH OPTIONS_SUB= yes +LIBFFI_DESC= Use libffi from ports instead of bundled version NLS_DESC= Enable gettext support for the locale module PYMALLOC_DESC= Enable specialized mallocs TSC_DESC= Enable processor timestamp counter profiling -LIBFFI_DESC= Use libffi from ports instead of bundled version HASH_DESC= Hash Algorithm (PEP-456) FNV_DESC= Modified Fowler-Noll-Vo Algorithm @@ -52,15 +52,20 @@ SIPHASH_DESC= SipHash24 Algorithm FNV_CONFIGURE_ON= --with-hash-algorithm=fnv SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 + DEBUG_CONFIGURE_WITH= pydebug IPV6_CONFIGURE_ENABLE= ipv6 +LIBFFI_CONFIGURE_ON= --with-system-ffi +LIBFFI_LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi + # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat # to break in Python 2.7, or preprocessor complaints in Python >= 3.3 # Upstream Issue: http://bugs.python.org/issue6299 + NLS_USES= gettext -NLS_LIBS= -L${LOCALBASE}/lib -lintl NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LIBS= -L${LOCALBASE}/lib -lintl NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no PYMALLOC_CONFIGURE_WITH= pymalloc @@ -68,6 +73,7 @@ PYMALLOC_CONFIGURE_WITH= pymalloc THREADS_CONFIGURE_WITH= threads THREADS_CFLAGS= ${PTHREAD_CFLAGS} THREADS_LDFLAGS= ${PTHREAD_LIBS} + TSC_CONFIGURE_WITH= tsc .include <bsd.port.options.mk> @@ -80,22 +86,18 @@ ABIFLAGS:= m${ABIFLAGS} ABIFLAGS:= d${ABIFLAGS} .endif -.if ${PORT_OPTIONS:MLIBFFI} -CONFIGURE_ARGS+= --with-system-ffi -LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi -.else -.if ${ARCH} == i386 -# http://bugs.python.org/issue22521 -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 PLIST_FILES+= libdata/pkgconfig/python-3.4%%ABI%%.pc .endif +# http://bugs.python.org/issue22521 +# http://bugs.python.org/issue23042 +.if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI} +BROKEN= You must use libffi from ports on i386. Enable the LIBFFI option +.endif + .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502110823.t1B8NDYg045019>