Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1016b2f

Browse files
gpsheadgpshead
committed
Rename the new --with-optimiations flag to --enable-optimizations.
1 parent bbfe6c3 commit 1016b2f

3 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,8 @@ Windows
555555
Build
556556
-----
557557

558+
- Issue #26359: Rename --with-optimiations to --enable-optimizations.
559+
558560
- Issue #28444: Fix missing extensions modules when cross compiling.
559561

560562
- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.

‎configure‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ with_suffix
815815
enable_shared
816816
enable_profiling
817817
with_pydebug
818-
with_optimizations
818+
enable_optimizations
819819
with_lto
820820
with_hash_algorithm
821821
with_address_sanitizer
@@ -1486,6 +1486,8 @@ Optional Features:
14861486
Build (MacOSX|Darwin) framework
14871487
--enable-shared disable/enable building shared python library
14881488
--enable-profiling enable C-level code profiling
1489+
--enable-optimizations Enable expensive optimizations (PGO, maybe LTO,
1490+
etc). Disabled by default.
14891491
--enable-loadable-sqlite-extensions
14901492
support loadable extensions in _sqlite module
14911493
--enable-ipv6 Enable ipv6 (with ipv4) support
@@ -1509,8 +1511,6 @@ Optional Packages:
15091511
compiler
15101512
--with-suffix=.exe set executable suffix
15111513
--with-pydebug build with Py_DEBUG defined
1512-
--with-optimizations Enable expensive optimizations (PGO, maybe LTO,
1513-
etc). Disabled by default.
15141514
--with-lto Enable Link Time Optimization in PGO builds.
15151515
Disabled by default.
15161516
--with-hash-algorithm=[fnv|siphash24]
@@ -6543,12 +6543,11 @@ fi
65436543

65446544

65456545
Py_OPT='false'
6546-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5
6547-
$as_echo_n "checking for --with-optimizations... " >&6; }
6548-
6549-
# Check whether --with-optimizations was given.
6550-
if test "${with_optimizations+set}" = set; then :
6551-
withval=$with_optimizations;
6546+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
6547+
$as_echo_n "checking for --enable-optimizations... " >&6; }
6548+
# Check whether --enable-optimizations was given.
6549+
if test "${enable_optimizations+set}" = set; then :
6550+
enableval=$enable_optimizations;
65526551
if test "$withval" != no
65536552
then
65546553
Py_OPT='true'
@@ -6808,7 +6807,7 @@ case $CC in
68086807
LLVM_PROF_ERR=yes
68096808
if test "${REQUIRE_PGO}" = "yes"
68106809
then
6811-
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
6810+
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
68126811
fi
68136812
fi
68146813
;;
@@ -6824,7 +6823,7 @@ case $CC in
68246823
LLVM_PROF_ERR=yes
68256824
if test "${REQUIRE_PGO}" = "yes"
68266825
then
6827-
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
6826+
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
68286827
fi
68296828
fi
68306829
;;
@@ -17829,7 +17828,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
1782917828
echo "" >&6
1783017829
echo "" >&6
1783117830
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
17832-
echo "please run ./configure --with-optimizations" >&6
17831+
echo "please run ./configure --enable-optimizations" >&6
1783317832
echo "" >&6
1783417833
echo "" >&6
1783517834
fi

‎configure.ac‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,8 +1234,8 @@ fi],
12341234
AC_SUBST(DEF_MAKE_ALL_RULE)
12351235
AC_SUBST(DEF_MAKE_RULE)
12361236
Py_OPT='false'
1237-
AC_MSG_CHECKING(for --with-optimizations)
1238-
AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
1237+
AC_MSG_CHECKING(for --enable-optimizations)
1238+
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
12391239
[
12401240
if test "$withval" != no
12411241
then
@@ -1351,7 +1351,7 @@ case $CC in
13511351
LLVM_PROF_ERR=yes
13521352
if test "${REQUIRE_PGO}" = "yes"
13531353
then
1354-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1354+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
13551355
fi
13561356
fi
13571357
;;
@@ -1367,7 +1367,7 @@ case $CC in
13671367
LLVM_PROF_ERR=yes
13681368
if test "${REQUIRE_PGO}" = "yes"
13691369
then
1370-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1370+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
13711371
fi
13721372
fi
13731373
;;
@@ -5379,7 +5379,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
53795379
echo "" >&AS_MESSAGE_FD
53805380
echo "" >&AS_MESSAGE_FD
53815381
echo "If you want a release build with all optimizations active (LTO, PGO, etc),"
5382-
echo "please run ./configure --with-optimizations" >&AS_MESSAGE_FD
5382+
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
53835383
echo "" >&AS_MESSAGE_FD
53845384
echo "" >&AS_MESSAGE_FD
53855385
fi

0 commit comments

Comments
 (0)