commit: 31089ae8f5885ba9b6f2fef5c1bc195614f634d2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> AuthorDate: Sun Mar 17 08:17:37 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Mar 17 08:18:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31089ae8
dev-libs/nss: fix 3.90.2esr on arm64 with an upstream patch Closes: https://bugs.gentoo.org/926625 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...-1885749-disable-ASM-C25519-on-non-X86_64.patch | 35 ++++++++++++++++++++++ dev-libs/nss/nss-3.90.2.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch new file mode 100644 index 000000000000..e5769308144c --- /dev/null +++ b/dev-libs/nss/files/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Natalia Kulatova <[email protected]> +# Date 1685981398 0 +# Node ID 52a5d8fe37410d940e7d3ca244146ebc46a7d52a +# Parent 52969cff7db635e0ee10fad66eed2c0cfdcf999b +Bug 1836781 - Disabling ASM C25519 for A but X86_64 r=bbeurdouche,nss-reviewers + +Differential Revision: https://phabricator.services.mozilla.com/D179969 + +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +--- a/lib/freebl/Makefile ++++ b/lib/freebl/Makefile +@@ -563,17 +563,19 @@ endif # target == SunO + ifdef USE_64 + # no __int128 at least up to lcc 1.23 (pretending to be gcc5) + # NB: CC_NAME is not defined here + ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc) + ifdef CC_IS_CLANG + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT + else ifeq (1,$(CC_IS_GCC)) +- SUPPORTS_VALE_CURVE25519 = 1 ++ ifeq ($(CPU_ARCH),x86_64) ++ SUPPORTS_VALE_CURVE25519 = 1 ++ endif + ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) + HAVE_INT128_SUPPORT = 1 + DEFINES += -DHAVE_INT128_SUPPORT + endif + ifneq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) + NSS_DISABLE_AVX2 = 1 + endif + ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION)))) + diff --git a/dev-libs/nss/nss-3.90.2.ebuild b/dev-libs/nss/nss-3.90.2.ebuild index 62ba736993a0..a23171281796 100644 --- a/dev-libs/nss/nss-3.90.2.ebuild +++ b/dev-libs/nss/nss-3.90.2.ebuild @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.53-gentoo-fixups.patch" "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" "${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch + "${FILESDIR}"/nss-3.90.2-bmo-1885749-disable-ASM-C25519-on-non-X86_64.patch ) src_prepare() {
