From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C24A8158094 for ; Thu, 23 Jun 2022 04:30:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DB0FE0B17; Thu, 23 Jun 2022 04:30:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3EC07E0B15 for ; Thu, 23 Jun 2022 04:30:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48104341B6B for ; Thu, 23 Jun 2022 04:30:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A577512 for ; Thu, 23 Jun 2022 04:29:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655958588.e6fa63e32cc33b26430dfcd01eec8cad219ab68a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/, dev-libs/marisa/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch dev-libs/marisa/marisa-0.2.6.ebuild X-VCS-Directories: dev-libs/marisa/files/ dev-libs/marisa/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e6fa63e32cc33b26430dfcd01eec8cad219ab68a X-VCS-Branch: master Date: Thu, 23 Jun 2022 04:29:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38935384-fef2-44e1-b735-a02cd5143e36 X-Archives-Hash: f94527f73057a94dadc76d4a5fd201ed commit: e6fa63e32cc33b26430dfcd01eec8cad219ab68a Author: matoro users noreply github com> AuthorDate: Thu Jun 23 04:05:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 23 04:29:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6fa63e3 dev-libs/marisa: fix build on 64-bit sparc See: https://github.com/gentoo/gentoo/commit/ddedb2650b0beb769a2e165681be5a99a46cfac8 See: https://github.com/gentoo/gentoo/commit/78057fe9e8fb2c1a89ff10dba205f2b40b009090 Closes: https://bugs.gentoo.org/843422 Signed-off-by: matoro users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/26050 Signed-off-by: Sam James gentoo.org> .../marisa/files/marisa-0.2.6-sparc64_word_size.patch | 16 ++++++++++++++++ dev-libs/marisa/marisa-0.2.6.ebuild | 1 + 2 files changed, 17 insertions(+) diff --git a/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch new file mode 100644 index 000000000000..ff789b1c9043 --- /dev/null +++ b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch @@ -0,0 +1,16 @@ +Originally reported in https://bugs.gentoo.org/show_bug.cgi?id=843422 +Upstream PR https://github.com/s-yata/marisa-trie/pull/46 + +diff --git a/include/marisa/base.h b/include/marisa/base.h +index bf4794e..95861b4 100644 +--- a/include/marisa/base.h ++++ b/include/marisa/base.h +@@ -30,7 +30,7 @@ typedef uint64_t marisa_uint64; + + #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \ + defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \ +- defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \ ++ (defined(__sparc__) && defined(__LP64__)) || defined(__mips64__) || defined(__aarch64__) || \ + defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \ + defined(__loongarch64) + #define MARISA_WORD_SIZE 64 diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild index a0f5769c7efa..7df3c25d5c77 100644 --- a/dev-libs/marisa/marisa-0.2.6.ebuild +++ b/dev-libs/marisa/marisa-0.2.6.ebuild @@ -41,6 +41,7 @@ fi PATCHES=( "${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch" "${FILESDIR}/${PN}-0.2.6-loong_word_size.patch" + "${FILESDIR}/${PN}-0.2.6-sparc64_word_size.patch" ) src_prepare() {