Skip to content

Commit b999915

Browse files
gpsheadgpshead
committed
Rename the new --with-optimiations flag to --enable-optimizations.
1 parent d54d327 commit b999915

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

‎Misc/NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ Tests
273273
Build
274274
-----
275275

276+
- Issue #26359: Rename --with-optimiations to --enable-optimizations.
277+
276278
- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
277279

278280
- Issue #28258: Fixed build with Estonian locale (distclean target in

‎configure

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ with_suffix
804804
enable_shared
805805
enable_profiling
806806
with_pydebug
807-
with_optimizations
807+
enable_optimizations
808808
with_lto
809809
enable_toolbox_glue
810810
with_libs
@@ -1475,6 +1475,8 @@ Optional Features:
14751475
Build (MacOSX|Darwin) framework
14761476
--enable-shared disable/enable building shared python library
14771477
--enable-profiling enable C-level code profiling
1478+
--enable-optimizations Enable expensive optimizations (PGO, maybe LTO,
1479+
etc). Disabled by default.
14781480
--enable-toolbox-glue disable/enable MacOSX glue code for extensions
14791481
--enable-ipv6 Enable ipv6 (with ipv4) support
14801482
--disable-ipv6 Disable ipv6 support
@@ -1499,8 +1501,6 @@ Optional Packages:
14991501
compiler
15001502
--with-suffix=.exe set executable suffix
15011503
--with-pydebug build with Py_DEBUG defined
1502-
--with-optimizations Enable expensive optimizations (PGO, maybe LTO,
1503-
etc). Disabled by default.
15041504
--with-lto Enable Link Time Optimization in PGO builds.
15051505
Disabled by default.
15061506
--with-libs='lib1 ...' link against additional libs
@@ -6386,12 +6386,11 @@ fi
63866386
63876387
63886388
Py_OPT='false'
6389-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5
6390-
$as_echo_n "checking for --with-optimizations... " >&6; }
6391-
6392-
# Check whether --with-optimizations was given.
6393-
if test "${with_optimizations+set}" = set; then :
6394-
withval=$with_optimizations;
6389+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
6390+
$as_echo_n "checking for --enable-optimizations... " >&6; }
6391+
# Check whether --enable-optimizations was given.
6392+
if test "${enable_optimizations+set}" = set; then :
6393+
enableval=$enable_optimizations;
63956394
if test "$withval" != no
63966395
then
63976396
Py_OPT='true'
@@ -6654,7 +6653,7 @@ case $CC in
66546653
LLVM_PROF_ERR=yes
66556654
if test "${REQUIRE_PGO}" = "yes"
66566655
then
6657-
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
6656+
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
66586657
fi
66596658
fi
66606659
;;
@@ -6670,7 +6669,7 @@ case $CC in
66706669
LLVM_PROF_ERR=yes
66716670
if test "${REQUIRE_PGO}" = "yes"
66726671
then
6673-
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
6672+
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
66746673
fi
66756674
fi
66766675
;;
@@ -16500,7 +16499,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
1650016499
echo "" >&6
1650116500
echo "" >&6
1650216501
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
16503-
echo "please run ./configure --with-optimizations" >&6
16502+
echo "please run ./configure --enable-optimizations" >&6
1650416503
echo "" >&6
1650516504
echo "" >&6
1650616505
fi

‎configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,8 +1370,8 @@ fi
13701370
AC_SUBST(DEF_MAKE_ALL_RULE)
13711371
AC_SUBST(DEF_MAKE_RULE)
13721372
Py_OPT='false'
1373-
AC_MSG_CHECKING(for --with-optimizations)
1374-
AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
1373+
AC_MSG_CHECKING(for --enable-optimizations)
1374+
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
13751375
[
13761376
if test "$withval" != no
13771377
then
@@ -1490,7 +1490,7 @@ case $CC in
14901490
LLVM_PROF_ERR=yes
14911491
if test "${REQUIRE_PGO}" = "yes"
14921492
then
1493-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1493+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
14941494
fi
14951495
fi
14961496
;;
@@ -1506,7 +1506,7 @@ case $CC in
15061506
LLVM_PROF_ERR=yes
15071507
if test "${REQUIRE_PGO}" = "yes"
15081508
then
1509-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1509+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
15101510
fi
15111511
fi
15121512
;;
@@ -4843,7 +4843,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
48434843
echo "" >&AS_MESSAGE_FD
48444844
echo "" >&AS_MESSAGE_FD
48454845
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
4846-
echo "please run ./configure --with-optimizations" >&AS_MESSAGE_FD
4846+
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
48474847
echo "" >&AS_MESSAGE_FD
48484848
echo "" >&AS_MESSAGE_FD
48494849
fi

0 commit comments

Comments
 (0)