diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2015-10-19 12:13:35 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2015-10-19 12:13:35 (GMT) |
| commit | 12a72b06c7eebd6f1d310775c5d3afff142c1058 (patch) | |
| tree | ccdcd8d38b9c714b8d0285fced655b030e5dd030 | |
| parent | ad56c922b064907af823a7cb51acc89135342a52 (diff) | |
| parent | 2bf91bf46cf5bf9913a126092a8d08bcd7a6157c (diff) | |
| download | cpython-12a72b06c7eebd6f1d310775c5d3afff142c1058.zip cpython-12a72b06c7eebd6f1d310775c5d3afff142c1058.tar.gz cpython-12a72b06c7eebd6f1d310775c5d3afff142c1058.tar.bz2 | |
- Issue #25440: Fix output of python-config --extension-suffix.
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Misc/python-config.sh.in | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1041,12 +1041,17 @@ Documentation Tools/Demos ----------- +<<<<<<< local - Issue #24000: Improved Argument Clinic's mapping of converters to legacy "format units". Updated the documentation to match. - Issue #24001: Argument Clinic converters now use accept={type} instead of types={'type'} to specify the types the converter accepts. +======= +- Issue #25440: Fix output of python-config --extension-suffix. + +>>>>>>> other - Issue #23330: h2py now supports arbitrary filenames in #include. - Issue #24031: make patchcheck now supports git checkouts, too. diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in index 64c81e5..30c6927 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -49,7 +49,7 @@ PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" LIBDEST=${prefix}/lib/python${VERSION} LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") -SO="@SO@" +SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" PLATINCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" |