mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
dev-libs/marisa: drop 0.2.6
Closes: https://bugs.gentoo.org/954267 Closes: https://bugs.gentoo.org/952313 Closes: https://bugs.gentoo.org/850949 Closes: https://github.com/gentoo/gentoo/pull/46052 Signed-off-by: Huang Rui <vowstar@gmail.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
This commit is contained in:
Huang Rui
Yixun Lan
@@ -1,3 +1,2 @@
|
||||
DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
|
||||
DIST marisa-0.2.7.tar.gz 214468 BLAKE2B 58a3f5a38099e16aaccd523df4e3fa49a7222d41a3b242dc7d328eca6d3fae09aaaa092b94e5e83d8a21ee36be86abe37007860271369e3de95b722f556e0570 SHA512 5e162d1e4b6e78e60354c19dbb419088d1d832591a701ee5a844f9e61747b0ec0333732d2832a771e2a1bae7cc9e199a9eae5098e430ff331b4de372ccce4798
|
||||
DIST marisa-0.3.1.tar.gz 212791 BLAKE2B 130735eb3743a78a32e9e2389da84b8cd251031c8362843d1fb26f32ee2d1a3a0acf1de413e0554959e0488b8f445bac92c41c3fa54b6c1dad5bb245dfe1584f SHA512 60757e354e4f0ff47662930af5c32a762c5f348c60019abb2d502c6c21ec220731edd9be8ea36e3ec68df90a6584eb311fe1e3d4258b3392609a87b0ef427121
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- a/include/marisa/base.h
|
||||
+++ b/include/marisa/base.h
|
||||
@@ -31,7 +31,8 @@
|
||||
#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
|
||||
defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
|
||||
defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \
|
||||
- defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64))
|
||||
+ defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \
|
||||
+ defined(__loongarch64)
|
||||
#define MARISA_WORD_SIZE 64
|
||||
#else // defined(_WIN64), etc.
|
||||
#define MARISA_WORD_SIZE 32
|
||||
@@ -1,11 +0,0 @@
|
||||
--- 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
|
||||
@@ -1,16 +0,0 @@
|
||||
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
|
||||
@@ -1,125 +0,0 @@
|
||||
# Copyright 2014-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
DISTUTILS_USE_PEP517="setuptools"
|
||||
DISTUTILS_OPTIONAL="1"
|
||||
DISTUTILS_EXT=1
|
||||
|
||||
inherit autotools distutils-r1 toolchain-funcs
|
||||
|
||||
if [[ "${PV}" == "9999" ]]; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
|
||||
HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
|
||||
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
|
||||
IUSE="python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND="python? (
|
||||
${PYTHON_DEPS}
|
||||
${DISTUTILS_DEPS}
|
||||
dev-lang/swig
|
||||
)"
|
||||
DEPEND="python? ( ${PYTHON_DEPS} )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
if [[ "${PV}" != "9999" ]]; then
|
||||
S="${WORKDIR}/marisa-trie-${PV}"
|
||||
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() {
|
||||
default
|
||||
eautoreconf
|
||||
|
||||
sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
|
||||
|
||||
if use python; then
|
||||
pushd bindings/python > /dev/null || die
|
||||
distutils-r1_src_prepare
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
|
||||
|
||||
cpu_instructions_option() {
|
||||
local option="${1}"
|
||||
local macros="${2}"
|
||||
local result="--enable-${option}"
|
||||
local macro
|
||||
for macro in ${macros}; do
|
||||
if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
|
||||
result="--disable-${option}"
|
||||
fi
|
||||
done
|
||||
echo "${result}"
|
||||
}
|
||||
|
||||
local options=(
|
||||
$(cpu_instructions_option sse2 __SSE2__)
|
||||
$(cpu_instructions_option sse3 __SSE3__)
|
||||
$(cpu_instructions_option ssse3 __SSSE3__)
|
||||
$(cpu_instructions_option sse4.1 __SSE4_1__)
|
||||
$(cpu_instructions_option sse4.2 __SSE4_2__)
|
||||
$(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
|
||||
$(cpu_instructions_option sse4a __SSE4A__)
|
||||
$(cpu_instructions_option popcnt __POPCNT__)
|
||||
$(cpu_instructions_option bmi __BMI__)
|
||||
$(cpu_instructions_option bmi2 __BMI2__)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
|
||||
econf "${options[@]}"
|
||||
|
||||
if use python; then
|
||||
pushd bindings/python > /dev/null || die
|
||||
distutils-r1_src_configure
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use python; then
|
||||
emake -C bindings swig-python
|
||||
pushd bindings/python > /dev/null || die
|
||||
distutils-r1_src_compile
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
|
||||
(
|
||||
docinto html
|
||||
dodoc docs/*
|
||||
)
|
||||
|
||||
if use python; then
|
||||
pushd bindings/python > /dev/null || die
|
||||
distutils-r1_src_install
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user