commit: 67d5e8becd1d75d307864ad28a6fd2304be64602 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 8 16:15:54 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 8 16:16:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d5e8be
dev-libs/openssl: elaborate on ec_nistp_64_gcc_128 reasoning, forward comment to 3.x Bug: https://bugs.gentoo.org/469976 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/openssl/openssl-1.0.2u-r1.ebuild | 19 ++++++++++--------- dev-libs/openssl/openssl-1.1.1q.ebuild | 14 ++++++++------ dev-libs/openssl/openssl-3.0.5.ebuild | 12 ++++++++++++ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild index a54fa8fc1b08..0da2a107522e 100644 --- a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild +++ b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -153,14 +153,15 @@ multilib_src_configure() { local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths. #460790 - local ec_nistp_64_gcc_128 - # Disable it for now though #469976 - #if ! use bindist ; then - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" #fi # https://github.com/openssl/openssl/issues/2286 diff --git a/dev-libs/openssl/openssl-1.1.1q.ebuild b/dev-libs/openssl/openssl-1.1.1q.ebuild index c4ed751b3d15..9182cb8af7f9 100644 --- a/dev-libs/openssl/openssl-1.1.1q.ebuild +++ b/dev-libs/openssl/openssl-1.1.1q.ebuild @@ -181,13 +181,15 @@ multilib_src_configure() { # See if our toolchain supports __uint128_t. If so, it's 64bit # friendly and can use the nicely optimized code paths, bug #460790. - local ec_nistp_64_gcc_128 - + #local ec_nistp_64_gcc_128 + # # Disable it for now though (bug #469976) - # echo "__uint128_t i;" > "${T}"/128.c - # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - # fi + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi local sslout=$(./gentoo.config) einfo "Use configuration ${sslout:-(openssl knows best)}" diff --git a/dev-libs/openssl/openssl-3.0.5.ebuild b/dev-libs/openssl/openssl-3.0.5.ebuild index ae1bd523cc63..83047974b399 100644 --- a/dev-libs/openssl/openssl-3.0.5.ebuild +++ b/dev-libs/openssl/openssl-3.0.5.ebuild @@ -179,6 +179,18 @@ multilib_src_configure() { local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths, bug #460790. + #local ec_nistp_64_gcc_128 + # + # Disable it for now though (bug #469976) + # Do NOT re-enable without substantial discussion first! + # + #echo "__uint128_t i;" > "${T}"/128.c + #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + #fi + local sslout=$(./gentoo.config) einfo "Using configuration: ${sslout:-(openssl knows best)}" local config="Configure"
