forked from python/cpython
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bpo-34121: Fix detection of C11 atomic support on clang. (pythonGH-8288)
- Loading branch information
Showing
5 changed files
with
24 additions
and
13 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
Misc/NEWS.d/next/Build/2018-07-15-16-49-06.bpo-34121.74G_lo.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix detection of C11 atomic support on clang. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,9 +12,9 @@ | |
# PARTICULAR PURPOSE. | ||
|
||
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | ||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
# serial 12 (pkg-config-0.29.2) | ||
|
||
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
dnl serial 11 (pkg-config-0.29.1) | ||
dnl | ||
dnl Copyright © 2004 Scott James Remnant <[email protected]>. | ||
dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> | ||
dnl | ||
|
@@ -55,7 +55,7 @@ dnl | |
dnl See the "Since" comment for each macro you use to see what version | ||
dnl of the macros you require. | ||
m4_defun([PKG_PREREQ], | ||
[m4_define([PKG_MACROS_VERSION], [0.29.2]) | ||
[m4_define([PKG_MACROS_VERSION], [0.29.1]) | ||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | ||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | ||
])dnl PKG_PREREQ | ||
|
@@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | |
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | ||
pkg_failed=no | ||
AC_MSG_CHECKING([for $2]) | ||
AC_MSG_CHECKING([for $1]) | ||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | ||
_PKG_CONFIG([$1][_LIBS], [libs], [$2]) | ||
|
@@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. | |
See the pkg-config man page for more details.]) | ||
if test $pkg_failed = yes; then | ||
AC_MSG_RESULT([no]) | ||
AC_MSG_RESULT([no]) | ||
_PKG_SHORT_ERRORS_SUPPORTED | ||
if test $_pkg_short_errors_supported = yes; then | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
else | ||
else | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
fi | ||
# Put the nasty error message in config.log where it belongs | ||
|
@@ -187,7 +187,7 @@ installed software in a non-standard prefix. | |
_PKG_TEXT])[]dnl | ||
]) | ||
elif test $pkg_failed = untried; then | ||
AC_MSG_RESULT([no]) | ||
AC_MSG_RESULT([no]) | ||
m4_default([$4], [AC_MSG_FAILURE( | ||
[The pkg-config script could not be found or is too old. Make sure it | ||
is in your PATH or set the PKG_CONFIG environment variable to the full | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters