From owner-svn-ports-head@FreeBSD.ORG Wed Jan 21 12:34:52 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39DED408; Wed, 21 Jan 2015 12:34:52 +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 25351A63; Wed, 21 Jan 2015 12:34:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0LCYqxS078345; Wed, 21 Jan 2015 12:34:52 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0LCYp6T078342; Wed, 21 Jan 2015 12:34:51 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201501211234.t0LCYp6T078342@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 21 Jan 2015 12:34:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377591 - in head/lang/python32: . files 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, 21 Jan 2015 12:34:52 -0000 Author: koobs Date: Wed Jan 21 12:34:50 2015 New Revision: 377591 URL: https://svnweb.freebsd.org/changeset/ports/377591 QAT: https://qat.redports.org/buildarchive/r377591/ Log: lang/python32: Fix ABIFLAGS for PYMALLOC option Investigating the comment regarding a 'configure script bug' lead me to a bug which manifested itself in 'm' not being added to ABIFLAGS when PYMALLOC was enabled, not the inability to set --without-pymalloc using PYMALLOC_CONFIGURE_WITH (options helpers). The incorrect ABIFLAGS caused packaging failures with default options, so I'm not sure how this wasn't picked up earlier: Error: Orphaned: include/python3.2u/ Error: Missing: include/python3.2mu/ - Backport an upstream commit [1] to correct the configure bug that never made it to the 3.2 branch. - Use options helpers for PYMALLOC accordingly While I'm here, clean up after the LIBFFI option addition: - Sort options variables: OPTIONS_* and *_DESC - Use OPTIONS helpers [1] https://hg.python.org/cpython/raw-rev/d158b0a78390 Approved by: python Added: head/lang/python32/files/patch-changeset-d158b0a78390 (contents, props changed) Modified: head/lang/python32/Makefile Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Wed Jan 21 12:31:25 2015 (r377590) +++ head/lang/python32/Makefile Wed Jan 21 12:34:50 2015 (r377591) @@ -33,17 +33,19 @@ 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 UCS4 LIBFFI -OPTIONS_DEFAULT= IPV6 NLS PYMALLOC THREADS UCS4 LIBFFI +OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC UCS4 +OPTIONS_DEFAULT= IPV6 LIBFFI NLS PYMALLOC THREADS UCS4 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 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 @@ -53,6 +55,8 @@ 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 + THREADS_CONFIGURE_WITH= threads THREADS_CFLAGS= ${PTHREAD_CFLAGS} THREADS_LDFLAGS= ${PTHREAD_LIBS} @@ -67,18 +71,10 @@ ABIFLAGS:= u${ABIFLAGS} .if ${PORT_OPTIONS:MPYMALLOC} ABIFLAGS:= m${ABIFLAGS} -.else -# Can't use PYMALLOC_CONFIGURE_WITH here, since the configure script has a bug -CONFIGURE_ARGS+= --without-pymalloc .endif .if ${PORT_OPTIONS:MDEBUG} -ABIFLAGS:= d${ABIFLAGS} -.endif - -.if ${PORT_OPTIONS:MLIBFFI} -CONFIGURE_ARGS+= --with-system-ffi -LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi +ABIFLAGS:= d${ABIFLAGS} .endif .if !empty(ABIFLAGS) Added: head/lang/python32/files/patch-changeset-d158b0a78390 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python32/files/patch-changeset-d158b0a78390 Wed Jan 21 12:34:50 2015 (r377591) @@ -0,0 +1,24 @@ +# HG changeset patch (based on) +# User doko@ubuntu.com +# Date 1341068713 -7200 +# Node ID d158b0a78390c104540c69d9d73f9c31fc5577dc +# Parent 575efae8ec5777b6130c29f7917d4e05303cfe12 +- Issue #3754: Some unrelated configure.ac cleanups. + +--- configure.orig 2015-01-21 11:43:28 UTC ++++ configure +@@ -9439,13 +9439,13 @@ fi + if test -z "$with_pymalloc" + then + with_pymalloc="yes" +- ABIFLAGS="${ABIFLAGS}m" + fi + if test "$with_pymalloc" != "no" + then + + $as_echo "#define WITH_PYMALLOC 1" >>confdefs.h + ++ ABIFLAGS="${ABIFLAGS}m" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5 + $as_echo "$with_pymalloc" >&6; }