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

Skip to content

Commit fe914c0

Browse files
gpsheadgpshead
committed
Rename the new --with-optimiations flag to --enable-optimizations.
2 parents f8d8d18 + 164eea5 commit fe914c0

3 files changed

Lines changed: 31 additions & 18 deletions

File tree

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,8 @@ Documentation
425425
Build
426426
-----
427427

428+
- Issue #26359: Rename --with-optimiations to --enable-optimizations.
429+
428430
- Issue #28444: Fix missing extensions modules when cross compiling.
429431

430432
- Issue #28208: Update Windows build and OS X installers to use SQLite 3.14.2.

‎configure‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ infodir
784784
docdir
785785
oldincludedir
786786
includedir
787+
runstatedir
787788
localstatedir
788789
sharedstatedir
789790
sysconfdir
@@ -817,7 +818,7 @@ with_suffix
817818
enable_shared
818819
enable_profiling
819820
with_pydebug
820-
with_optimizations
821+
enable_optimizations
821822
with_lto
822823
with_hash_algorithm
823824
with_address_sanitizer
@@ -894,6 +895,7 @@ datadir='${datarootdir}'
894895
sysconfdir='${prefix}/etc'
895896
sharedstatedir='${prefix}/com'
896897
localstatedir='${prefix}/var'
898+
runstatedir='${localstatedir}/run'
897899
includedir='${prefix}/include'
898900
oldincludedir='/usr/include'
899901
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1146,6 +1148,15 @@ do
11461148
| -silent | --silent | --silen | --sile | --sil)
11471149
silent=yes ;;
11481150

1151+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1152+
| --runstate | --runstat | --runsta | --runst | --runs \
1153+
| --run | --ru | --r)
1154+
ac_prev=runstatedir ;;
1155+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1156+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1157+
| --run=* | --ru=* | --r=*)
1158+
runstatedir=$ac_optarg ;;
1159+
11491160
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11501161
ac_prev=sbindir ;;
11511162
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1283,7 +1294,7 @@ fi
12831294
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12841295
datadir sysconfdir sharedstatedir localstatedir includedir \
12851296
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1286-
libdir localedir mandir
1297+
libdir localedir mandir runstatedir
12871298
do
12881299
eval ac_val=\$$ac_var
12891300
# Remove trailing slashes.
@@ -1436,6 +1447,7 @@ Fine tuning of the installation directories:
14361447
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14371448
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14381449
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1450+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14391451
--libdir=DIR object code libraries [EPREFIX/lib]
14401452
--includedir=DIR C header files [PREFIX/include]
14411453
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1476,6 +1488,8 @@ Optional Features:
14761488
Build (MacOSX|Darwin) framework
14771489
--enable-shared disable/enable building shared python library
14781490
--enable-profiling enable C-level code profiling
1491+
--enable-optimizations Enable expensive optimizations (PGO, etc). Disabled
1492+
by default.
14791493
--enable-loadable-sqlite-extensions
14801494
support loadable extensions in _sqlite module
14811495
--enable-ipv6 Enable ipv6 (with ipv4) support
@@ -1499,8 +1513,6 @@ Optional Packages:
14991513
compiler
15001514
--with-suffix=.exe set executable suffix
15011515
--with-pydebug build with Py_DEBUG defined
1502-
--with-optimizations Enable expensive optimizations (PGO, etc). Disabled
1503-
by default.
15041516
--with-lto Enable Link Time Optimization in PGO builds.
15051517
Disabled by default.
15061518
--with-hash-algorithm=[fnv|siphash24]
@@ -6524,12 +6536,11 @@ fi
65246536

65256537

65266538
Py_OPT='false'
6527-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5
6528-
$as_echo_n "checking for --with-optimizations... " >&6; }
6529-
6530-
# Check whether --with-optimizations was given.
6531-
if test "${with_optimizations+set}" = set; then :
6532-
withval=$with_optimizations;
6539+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
6540+
$as_echo_n "checking for --enable-optimizations... " >&6; }
6541+
# Check whether --enable-optimizations was given.
6542+
if test "${enable_optimizations+set}" = set; then :
6543+
enableval=$enable_optimizations;
65336544
if test "$withval" != no
65346545
then
65356546
Py_OPT='true'
@@ -6796,7 +6807,7 @@ case $CC in
67966807
LLVM_PROF_ERR=yes
67976808
if test "${REQUIRE_PGO}" = "yes"
67986809
then
6799-
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
68006811
fi
68016812
fi
68026813
;;
@@ -6812,7 +6823,7 @@ case $CC in
68126823
LLVM_PROF_ERR=yes
68136824
if test "${REQUIRE_PGO}" = "yes"
68146825
then
6815-
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
68166827
fi
68176828
fi
68186829
;;
@@ -17877,7 +17888,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
1787717888
echo "" >&6
1787817889
echo "" >&6
1787917890
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&6
17880-
echo "please run ./configure --with-optimizations" >&6
17891+
echo "please run ./configure --enable-optimizations" >&6
1788117892
echo "" >&6
1788217893
echo "" >&6
1788317894
fi

‎configure.ac‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,8 +1281,8 @@ fi],
12811281
AC_SUBST(DEF_MAKE_ALL_RULE)
12821282
AC_SUBST(DEF_MAKE_RULE)
12831283
Py_OPT='false'
1284-
AC_MSG_CHECKING(for --with-optimizations)
1285-
AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
1284+
AC_MSG_CHECKING(for --enable-optimizations)
1285+
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
12861286
[
12871287
if test "$withval" != no
12881288
then
@@ -1405,7 +1405,7 @@ case $CC in
14051405
LLVM_PROF_ERR=yes
14061406
if test "${REQUIRE_PGO}" = "yes"
14071407
then
1408-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1408+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
14091409
fi
14101410
fi
14111411
;;
@@ -1421,7 +1421,7 @@ case $CC in
14211421
LLVM_PROF_ERR=yes
14221422
if test "${REQUIRE_PGO}" = "yes"
14231423
then
1424-
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
1424+
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
14251425
fi
14261426
fi
14271427
;;
@@ -5399,7 +5399,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
53995399
echo "" >&AS_MESSAGE_FD
54005400
echo "" >&AS_MESSAGE_FD
54015401
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&AS_MESSAGE_FD
5402-
echo "please run ./configure --with-optimizations" >&AS_MESSAGE_FD
5402+
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
54035403
echo "" >&AS_MESSAGE_FD
54045404
echo "" >&AS_MESSAGE_FD
54055405
fi

0 commit comments

Comments
 (0)