bpo-29585: Fix sysconfig.get_config_var("PYTHONFRAMEWORK") (GH-2483)
`PYTHONFRAMEWORK` is defined in `Makefile` and it shoulnd't be used in `pyconfig.h`. `sysconfig.py --generate-posix-vars` reads config vars from Makefile and `pyconfig.h`. Conflicting variables should be avoided. Especially, string config variables in Makefile are unquoted, but in `pyconfig.h` are keep quoted. So it should be private (starts with underscore).
This commit is contained in:
parent
7526cadd64
commit
6b42eb1764
|
@ -694,6 +694,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
|
|||
#define HAVE_INET_PTON 1
|
||||
|
||||
/* framework name */
|
||||
#define PYTHONFRAMEWORK ""
|
||||
#define _PYTHONFRAMEWORK ""
|
||||
|
||||
#endif /* !Py_CONFIG_H */
|
||||
|
|
|
@ -1965,7 +1965,7 @@ _PySys_BeginInit(void)
|
|||
SET_SYS_FROM_STRING("_git",
|
||||
Py_BuildValue("(szz)", "CPython", _Py_gitidentifier(),
|
||||
_Py_gitversion()));
|
||||
SET_SYS_FROM_STRING("_framework", PyUnicode_FromString(PYTHONFRAMEWORK));
|
||||
SET_SYS_FROM_STRING("_framework", PyUnicode_FromString(_PYTHONFRAMEWORK));
|
||||
SET_SYS_FROM_STRING("api_version",
|
||||
PyLong_FromLong(PYTHON_API_VERSION));
|
||||
SET_SYS_FROM_STRING("copyright",
|
||||
|
|
|
@ -3245,7 +3245,7 @@ fi
|
|||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define PYTHONFRAMEWORK "${PYTHONFRAMEWORK}"
|
||||
#define _PYTHONFRAMEWORK "${PYTHONFRAMEWORK}"
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@ AC_SUBST(FRAMEWORKPYTHONW)
|
|||
AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
|
||||
AC_SUBST(FRAMEWORKINSTALLAPPSPREFIX)
|
||||
|
||||
AC_DEFINE_UNQUOTED(PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
|
||||
AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
|
||||
|
||||
##AC_ARG_WITH(dyld,
|
||||
## AS_HELP_STRING([--with-dyld],
|
||||
|
|
|
@ -1247,9 +1247,6 @@
|
|||
/* Define as the preferred size in bits of long digits */
|
||||
#undef PYLONG_BITS_IN_DIGIT
|
||||
|
||||
/* framework name */
|
||||
#undef PYTHONFRAMEWORK
|
||||
|
||||
/* Define if you want to coerce the C locale to a UTF-8 based locale */
|
||||
#undef PY_COERCE_C_LOCALE
|
||||
|
||||
|
@ -1464,6 +1461,9 @@
|
|||
/* Define if you have POSIX threads, and your system does not define that. */
|
||||
#undef _POSIX_THREADS
|
||||
|
||||
/* framework name */
|
||||
#undef _PYTHONFRAMEWORK
|
||||
|
||||
/* Define to force use of thread-safe errno, h_errno, and other functions */
|
||||
#undef _REENTRANT
|
||||
|
||||
|
|
Loading…
Reference in New Issue