forked from Lainports/freebsd-ports
5da5cfa9d3
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/<file> <snip> Error: Missing: include/python3.2mu/<file> - 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
24 lines
642 B
Text
24 lines
642 B
Text
# 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; }
|