bpo-29585: Fix sysconfig.get_config_var("PYTHONFRAMEWORK") (GH-2483) · python/cpython@6b42eb1 (original) (raw)

5 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -694,6 +694,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
694 694 #define HAVE_INET_PTON 1
695 695
696 696 /* framework name */
697 -#define PYTHONFRAMEWORK ""
697 +#define _PYTHONFRAMEWORK ""
698 698
699 699 #endif /* !Py_CONFIG_H */
Original file line number Diff line number Diff line change
@@ -1965,7 +1965,7 @@ _PySys_BeginInit(void)
1965 1965 SET_SYS_FROM_STRING("_git",
1966 1966 Py_BuildValue("(szz)", "CPython", _Py_gitidentifier(),
1967 1967 _Py_gitversion()));
1968 -SET_SYS_FROM_STRING("_framework", PyUnicode_FromString(PYTHONFRAMEWORK));
1968 +SET_SYS_FROM_STRING("_framework", PyUnicode_FromString(_PYTHONFRAMEWORK));
1969 1969 SET_SYS_FROM_STRING("api_version",
1970 1970 PyLong_FromLong(PYTHON_API_VERSION));
1971 1971 SET_SYS_FROM_STRING("copyright",
Original file line number Diff line number Diff line change
@@ -3245,7 +3245,7 @@ fi
3245 3245
3246 3246
3247 3247 cat >>confdefs.h <<_ACEOF
3248 -#define PYTHONFRAMEWORK "${PYTHONFRAMEWORK}"
3248 +#define _PYTHONFRAMEWORK "${PYTHONFRAMEWORK}"
3249 3249 _ACEOF
3250 3250
3251 3251
Original file line number Diff line number Diff line change
@@ -355,7 +355,7 @@ AC_SUBST(FRAMEWORKPYTHONW)
355 355 AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
356 356 AC_SUBST(FRAMEWORKINSTALLAPPSPREFIX)
357 357
358 -AC_DEFINE_UNQUOTED(PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
358 +AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
359 359
360 360 ##AC_ARG_WITH(dyld,
361 361 ## AS_HELP_STRING([--with-dyld],
Original file line number Diff line number Diff line change
@@ -1247,9 +1247,6 @@
1247 1247 /* Define as the preferred size in bits of long digits */
1248 1248 #undef PYLONG_BITS_IN_DIGIT
1249 1249
1250 -/* framework name */
1251 -#undef PYTHONFRAMEWORK
1252 -
1253 1250 /* Define if you want to coerce the C locale to a UTF-8 based locale */
1254 1251 #undef PY_COERCE_C_LOCALE
1255 1252
@@ -1464,6 +1461,9 @@
1464 1461 /* Define if you have POSIX threads, and your system does not define that. */
1465 1462 #undef _POSIX_THREADS
1466 1463
1464 +/* framework name */
1465 +#undef _PYTHONFRAMEWORK
1466 +
1467 1467 /* Define to force use of thread-safe errno, h_errno, and other functions */
1468 1468 #undef _REENTRANT
1469 1469