From f4fc10428424904caf2035cffc442195cb088b2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Jul 2021 10:27:13 +0100 Subject: gentoo resync : 28.07.2021 --- dev-libs/marisa/Manifest | 3 ++- dev-libs/marisa/files/marisa-0.2.6-riscv_word_size.patch | 11 +++++++++++ dev-libs/marisa/marisa-0.2.6.ebuild | 8 ++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 dev-libs/marisa/files/marisa-0.2.6-riscv_word_size.patch (limited to 'dev-libs/marisa') diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest index b0e3b2fa520f..a6dbe2a521de 100644 --- a/dev-libs/marisa/Manifest +++ b/dev-libs/marisa/Manifest @@ -1,7 +1,8 @@ AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2 +AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d EBUILD marisa-0.2.5.ebuild 2262 BLAKE2B 4b59b590907a1ce4426142ad0bcf0770e048f9cc56d41802fd44f78b1827e98feac6cb4391c58d6ad77487f391759adfc824d011592737fda04af10963e6f5b4 SHA512 cabdee55108d6d1ddafb9df2ba684da1ee838a99ff9f8bd7a5df5e4ae4341b20a84eac98ae9b0374db07aef1078040d6591e4310f184ab48d22ec8e1f2bbae1e -EBUILD marisa-0.2.6.ebuild 2839 BLAKE2B 6e6683511ab508fc6cccd4b5210de25e8fb5bfa24c3a127e1bcb4d6b51ed44062c96ff9bda4d6444120d881bbc576cbb8c937eda5c3917939ac804963ea62f0f SHA512 6926ad3a1ea05f70aba5611de8d02e0280fd3ac934e3127629b70358e083d9bf106b65f64c1abacd5b3ed94252e37dd2145fbed1f52f40274d34f78e6f88d888 +EBUILD marisa-0.2.6.ebuild 2904 BLAKE2B 805572704ef2669dee3de403ae3f234cc22ec5aafda3c138b6107308d7ed06476ffd71a814d363f670605b277c423a1ba04ecee624ff19e429a5eff58b936fb3 SHA512 6084ca852d7c8df7d91f5605fe32db155f1ff93b7a421206fd6c0e3de16463cf45bf138852402c94c3c91f256ab5a544db0b69bcf6993d5fc248811c7a1ba3f5 EBUILD marisa-9999.ebuild 2796 BLAKE2B aae358f1d13901cad56450e9173f8934fb690fa45ab154d39414830cce1755b320e106cddf6f1629c9aa1cdc1b2d822364ab7cb113423b8914c1e4f53a1cea07 SHA512 f0820a5257e3724ba8ec665187746f5a22595d0f07e6218b7ffc70608b1989dfa762fbdbd5f045479432ccb1df671d39a6e1435fa765fa96fafcb709fe7705a8 MISC metadata.xml 465 BLAKE2B 7e3cf178e0635e628f362132ffaa3e8183c8a74b322624441137e64182c3a15c7fa28dea8c65c006589cc34625ae0af3da6569206f716faeaa6036e32f1aeb7d SHA512 5f36a2b6288061acf03f9d216e49d3368cf7d0af9f78d5d21f71dbc7e40bcdc4bbdb861e60cadf5c94f28978c5da62e4bb5c2b69b16a140cf5aee0fa8ab0df8e diff --git a/dev-libs/marisa/files/marisa-0.2.6-riscv_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-riscv_word_size.patch new file mode 100644 index 000000000000..49750d807619 --- /dev/null +++ b/dev-libs/marisa/files/marisa-0.2.6-riscv_word_size.patch @@ -0,0 +1,11 @@ +--- a/include/marisa/base.h ++++ b/include/marisa/base.h +@@ -31,7 +31,7 @@ + #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \ + defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \ + defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \ +- defined(__s390x__) ++ defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) + #define MARISA_WORD_SIZE 64 + #else // defined(_WIN64), etc. + #define MARISA_WORD_SIZE 32 diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild index 1ed697e7aea3..c958dfd64c35 100644 --- a/dev-libs/marisa/marisa-0.2.6.ebuild +++ b/dev-libs/marisa/marisa-0.2.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +PYTHON_COMPAT=( python3_{8,9} ) DISTUTILS_OPTIONAL="1" DISTUTILS_USE_SETUPTOOLS="no" @@ -24,7 +24,7 @@ fi LICENSE="|| ( BSD-2 LGPL-2.1+ )" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -39,6 +39,10 @@ if [[ "${PV}" != "9999" ]]; then S="${WORKDIR}/marisa-trie-${PV}" fi +PATCHES=( + "${FILESDIR}"/${PN}-0.2.6-riscv_word_size.patch +) + src_prepare() { default eautoreconf -- cgit v1.2.3