(original) (raw)

changeset: 105238:d5ff5a2f33fd branch: 2.7 parent: 105228:01f867e9cd34 user: Gregory P. Smith greg@krypto.org [Google Inc.] date: Sun Nov 20 21:19:36 2016 +0000 files: Misc/NEWS configure configure.ac description: Rename the new --with-optimiations flag to --enable-optimizations. diff -r 01f867e9cd34 -r d5ff5a2f33fd Misc/NEWS --- a/Misc/NEWS Sun Nov 20 20:04:54 2016 +0200 +++ b/Misc/NEWS Sun Nov 20 21:19:36 2016 +0000 @@ -273,6 +273,8 @@ Build ----- +- Issue #26359: Rename --with-optimiations to --enable-optimizations. + - Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j. - Issue #28258: Fixed build with Estonian locale (distclean target in diff -r 01f867e9cd34 -r d5ff5a2f33fd configure --- a/configure Sun Nov 20 20:04:54 2016 +0200 +++ b/configure Sun Nov 20 21:19:36 2016 +0000 @@ -804,7 +804,7 @@ enable_shared enable_profiling with_pydebug -with_optimizations +enable_optimizations with_lto enable_toolbox_glue with_libs @@ -1475,6 +1475,8 @@ Build (MacOSX|Darwin) framework --enable-shared disable/enable building shared python library --enable-profiling enable C-level code profiling + --enable-optimizations Enable expensive optimizations (PGO, maybe LTO, + etc). Disabled by default. --enable-toolbox-glue disable/enable MacOSX glue code for extensions --enable-ipv6 Enable ipv6 (with ipv4) support --disable-ipv6 Disable ipv6 support @@ -1499,8 +1501,6 @@ compiler --with-suffix=.exe set executable suffix --with-pydebug build with Py_DEBUG defined - --with-optimizations Enable expensive optimizations (PGO, maybe LTO, - etc). Disabled by default. --with-lto Enable Link Time Optimization in PGO builds. Disabled by default. --with-libs='lib1 ...' link against additional libs @@ -6386,12 +6386,11 @@ Py_OPT='false' -{ asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5 -$as_echo_n "checking for --with-optimizations... " >&6; } - -# Check whether --with-optimizations was given. -if test "${with_optimizations+set}" = set; then : - withval=$with_optimizations; +{ asecho"as_echo "asecho"as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5 +$as_echo_n "checking for --enable-optimizations... " >&6; } +# Check whether --enable-optimizations was given. +if test "${enable_optimizations+set}" = set; then : + enableval=$enable_optimizations; if test "$withval" != no then Py_OPT='true' @@ -6654,7 +6653,7 @@ LLVM_PROF_ERR=yes if test "${REQUIRE_PGO}" = "yes" then - as_fn_error ?"llvm−profdataisrequiredfora−−with−optimizationsbuildbutcouldnotbefound.""? "llvm-profdata is required for a --with-optimizations build but could not be found." "?"llvm−profdataisrequiredfora−−with−optimizationsbuildbutcouldnotbefound.""LINENO" 5 + as_fn_error ?"llvm−profdataisrequiredfora−−enable−optimizationsbuildbutcouldnotbefound.""? "llvm-profdata is required for a --enable-optimizations build but could not be found." "?"llvm−profdataisrequiredfora−−enable−optimizationsbuildbutcouldnotbefound.""LINENO" 5 fi fi ;; @@ -6670,7 +6669,7 @@ LLVM_PROF_ERR=yes if test "${REQUIRE_PGO}" = "yes" then - as_fn_error ?"llvm−profdataisrequiredfora−−with−optimizationsbuildbutcouldnotbefound.""? "llvm-profdata is required for a --with-optimizations build but could not be found." "?"llvm−profdataisrequiredfora−−with−optimizationsbuildbutcouldnotbefound.""LINENO" 5 + as_fn_error ?"llvm−profdataisrequiredfora−−enable−optimizationsbuildbutcouldnotbefound.""? "llvm-profdata is required for a --enable-optimizations build but could not be found." "?"llvm−profdataisrequiredfora−−enable−optimizationsbuildbutcouldnotbefound.""LINENO" 5 fi fi ;; @@ -16500,7 +16499,7 @@ echo "" >&6 echo "" >&6 echo "If you want a release build with all optimizations active (LTO, PGO, etc)," - echo "please run ./configure --with-optimizations" >&6 + echo "please run ./configure --enable-optimizations" >&6 echo "" >&6 echo "" >&6 fi diff -r 01f867e9cd34 -r d5ff5a2f33fd configure.ac --- a/configure.ac Sun Nov 20 20:04:54 2016 +0200 +++ b/configure.ac Sun Nov 20 21:19:36 2016 +0000 @@ -1370,8 +1370,8 @@ AC_SUBST(DEF_MAKE_ALL_RULE) AC_SUBST(DEF_MAKE_RULE) Py_OPT='false' -AC_MSG_CHECKING(for --with-optimizations) -AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]), +AC_MSG_CHECKING(for --enable-optimizations) +AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]), [ if test "$withval" != no then @@ -1490,7 +1490,7 @@ LLVM_PROF_ERR=yes if test "${REQUIRE_PGO}" = "yes" then - AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.]) + AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.]) fi fi ;; @@ -1506,7 +1506,7 @@ LLVM_PROF_ERR=yes if test "${REQUIRE_PGO}" = "yes" then - AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.]) + AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.]) fi fi ;; @@ -4843,7 +4843,7 @@ echo "" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD echo "If you want a release build with all optimizations active (LTO, PGO, etc)," - echo "please run ./configure --with-optimizations" >&AS_MESSAGE_FD + echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD echo "" >&AS_MESSAGE_FD fi /greg@krypto.org