Skip to content

Commit a033804

Browse files
authored
[3.5] Clarify what --enable-optimizations does (GH-1847) (GH-2040)
(cherry picked from commit b4e5fee)
1 parent d913d1c commit a033804

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

configure

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ infodir
781781
docdir
782782
oldincludedir
783783
includedir
784-
runstatedir
785784
localstatedir
786785
sharedstatedir
787786
sysconfdir
@@ -893,7 +892,6 @@ datadir='${datarootdir}'
893892
sysconfdir='${prefix}/etc'
894893
sharedstatedir='${prefix}/com'
895894
localstatedir='${prefix}/var'
896-
runstatedir='${localstatedir}/run'
897895
includedir='${prefix}/include'
898896
oldincludedir='/usr/include'
899897
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1146,15 +1144,6 @@ do
11461144
| -silent | --silent | --silen | --sile | --sil)
11471145
silent=yes ;;
11481146

1149-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1150-
| --runstate | --runstat | --runsta | --runst | --runs \
1151-
| --run | --ru | --r)
1152-
ac_prev=runstatedir ;;
1153-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1154-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1155-
| --run=* | --ru=* | --r=*)
1156-
runstatedir=$ac_optarg ;;
1157-
11581147
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11591148
ac_prev=sbindir ;;
11601149
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1292,7 +1281,7 @@ fi
12921281
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12931282
datadir sysconfdir sharedstatedir localstatedir includedir \
12941283
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1295-
libdir localedir mandir runstatedir
1284+
libdir localedir mandir
12961285
do
12971286
eval ac_val=\$$ac_var
12981287
# Remove trailing slashes.
@@ -1445,7 +1434,6 @@ Fine tuning of the installation directories:
14451434
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14461435
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14471436
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1448-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14491437
--libdir=DIR object code libraries [EPREFIX/lib]
14501438
--includedir=DIR C header files [PREFIX/include]
14511439
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1486,8 +1474,8 @@ Optional Features:
14861474
Build (MacOSX|Darwin) framework
14871475
--enable-shared disable/enable building shared python library
14881476
--enable-profiling enable C-level code profiling
1489-
--enable-optimizations Enable expensive optimizations (PGO, maybe LTO,
1490-
etc). Disabled by default.
1477+
--enable-optimizations Enable expensive, stable optimizations (PGO, etc).
1478+
Disabled by default.
14911479
--enable-loadable-sqlite-extensions
14921480
support loadable extensions in _sqlite module
14931481
--enable-ipv6 Enable ipv6 (with ipv4) support
@@ -17838,7 +17826,7 @@ mv config.c Modules
1783817826
if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
1783917827
echo "" >&6
1784017828
echo "" >&6
17841-
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
17829+
echo "If you want a release build with all stable optimizations active (PGO, etc),"
1784217830
echo "please run ./configure --enable-optimizations" >&6
1784317831
echo "" >&6
1784417832
echo "" >&6

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ AC_SUBST(DEF_MAKE_ALL_RULE)
12261226
AC_SUBST(DEF_MAKE_RULE)
12271227
Py_OPT='false'
12281228
AC_MSG_CHECKING(for --enable-optimizations)
1229-
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
1229+
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive, stable optimizations (PGO, etc). Disabled by default.]),
12301230
[
12311231
if test "$enableval" != no
12321232
then
@@ -5389,7 +5389,7 @@ mv config.c Modules
53895389
if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
53905390
echo "" >&AS_MESSAGE_FD
53915391
echo "" >&AS_MESSAGE_FD
5392-
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
5392+
echo "If you want a release build with all stable optimizations active (PGO, etc),"
53935393
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
53945394
echo "" >&AS_MESSAGE_FD
53955395
echo "" >&AS_MESSAGE_FD

0 commit comments

Comments
 (0)