diff options
| -rw-r--r-- | dev-libs/marisa/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch | 157 | ||||
| -rw-r--r-- | dev-libs/marisa/marisa-0.2.5.ebuild | 108 |
3 files changed, 0 insertions, 266 deletions
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest index 7b524798645e..e6b7e3213805 100644 --- a/dev-libs/marisa/Manifest +++ b/dev-libs/marisa/Manifest @@ -1,2 +1 @@ -DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch deleted file mode 100644 index dba677221a19..000000000000 --- a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch +++ /dev/null @@ -1,157 +0,0 @@ -https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7 - ---- /configure.ac -+++ /configure.ac -@@ -13,6 +13,56 @@ - - AC_CONFIG_MACRO_DIR([m4]) - -+# Macros for SSE availability check. -+AC_DEFUN([MARISA_ENABLE_SSE2], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSE2__ -+yes -+#endif -+ ], [enable_sse2="yes"], [enable_sse2="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSE3], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSE3__ -+yes -+#endif -+ ], [enable_sse3="yes"], [enable_sse3="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSSE3], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSSE3__ -+yes -+#endif -+ ], [enable_ssse3="yes"], [enable_ssse3="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSE4_1], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSE4_1__ -+yes -+#endif -+ ], [enable_sse4_1="yes"], [enable_sse4_1="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSE4_2], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSE4_2__ -+yes -+#endif -+ ], [enable_sse4_2="yes"], [enable_sse4_2="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSE4], -+ [AC_EGREP_CPP([yes], [ -+#if defined(__POPCNT__) && defined(__SSE4_2__) -+yes -+#endif -+ ], [enable_sse4="yes"], [enable_sse4="no"])]) -+AC_DEFUN([MARISA_ENABLE_SSE4A], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __SSE4A__ -+yes -+#endif -+ ], [enable_sse4a="yes"], [enable_sse4a="no"])]) -+AC_DEFUN([MARISA_ENABLE_POPCNT], -+ [AC_EGREP_CPP([yes], [ -+#ifdef __POPCNT__ -+yes -+#endif -+ ], [enable_popcnt="yes"], [enable_popcnt="no"])]) -+ - # Checks for SSE availability. - AC_MSG_CHECKING([whether to use SSE2]) - AC_ARG_ENABLE([sse2], -@@ -20,9 +70,7 @@ - [use SSE2 [default=no]])], - [], - [enable_sse2="no"]) --AS_IF([test "x${enable_sse2}" != "xno"], [ -- enable_sse2="yes" --]) -+AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2]) - AC_MSG_RESULT([${enable_sse2}]) - - AC_MSG_CHECKING([whether to use SSE3]) -@@ -31,9 +79,7 @@ - [use SSE3 [default=no]])], - [], - [enable_sse3="no"]) --AS_IF([test "x${enable_sse3}" != "xno"], [ -- enable_sse3="yes" --]) -+AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3]) - AC_MSG_RESULT([${enable_sse3}]) - - AC_MSG_CHECKING([whether to use SSSE3]) -@@ -42,9 +88,7 @@ - [use SSSE3 [default=no]])], - [], - [enable_ssse3="no"]) --AS_IF([test "x${enable_ssse3}" != "xno"], [ -- enable_ssse3="yes" --]) -+AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3]) - AC_MSG_RESULT([${enable_ssse3}]) - - AC_MSG_CHECKING([whether to use SSE4.1]) -@@ -53,9 +97,7 @@ - [use SSE4.1 [default=no]])], - [], - [enable_sse4_1="no"]) --AS_IF([test "x${enable_sse4_1}" != "xno"], [ -- enable_sse4_1="yes" --]) -+AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1]) - AC_MSG_RESULT([${enable_sse4_1}]) - - AC_MSG_CHECKING([whether to use SSE4.2]) -@@ -64,9 +106,7 @@ - [use SSE4.2 [default=no]])], - [], - [enable_sse4_2="no"]) --AS_IF([test "x${enable_sse4_2}" != "xno"], [ -- enable_sse4_2="yes" --]) -+AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2]) - AC_MSG_RESULT([${enable_sse4_2}]) - - AC_MSG_CHECKING([whether to use SSE4]) -@@ -75,9 +115,7 @@ - [use SSE4 [default=no]])], - [], - [enable_sse4="no"]) --AS_IF([test "x${enable_sse4}" != "xno"], [ -- enable_sse4="yes" --]) -+AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4]) - AC_MSG_RESULT([${enable_sse4}]) - - AC_MSG_CHECKING([whether to use SSE4a]) -@@ -86,9 +124,7 @@ - [use SSE4a [default=no]])], - [], - [enable_sse4a="no"]) --AS_IF([test "x${enable_sse4a}" != "xno"], [ -- enable_sse4a="yes" --]) -+AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A]) - AC_MSG_RESULT([${enable_sse4a}]) - - AC_MSG_CHECKING([whether to use popcnt]) -@@ -97,9 +133,7 @@ - [use POPCNT [default=no]])], - [], - [enable_popcnt="no"]) --AS_IF([test "x${enable_popcnt}" != "xno"], [ -- enable_popcnt="yes" --]) -+AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT]) - AC_MSG_RESULT([${enable_popcnt}]) - - AS_IF([test "x${enable_popcnt}" != "xno"], [ -@@ -170,6 +204,7 @@ - AS_ECHO([" LDFLAGS: ${LDFLAGS}"]) - AS_ECHO([" PREFIX: ${prefix}"]) - AS_ECHO([]) -+AS_ECHO([" NATIVE: ${enable_native_code}"]) - AS_ECHO([" SSE2: ${enable_sse2}"]) - AS_ECHO([" SSE3: ${enable_sse3}"]) - AS_ECHO([" SSSE3: ${enable_ssse3}"]) diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild deleted file mode 100644 index af6c3b508d46..000000000000 --- a/dev-libs/marisa/marisa-0.2.5.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 2014-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -DISTUTILS_OPTIONAL="1" - -inherit autotools distutils-r1 - -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="" -else - 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 ppc ppc64 sparc x86" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="python? ( - ${PYTHON_DEPS} - dev-lang/swig - )" -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/marisa-trie-${PV}" -fi - -PATCHES=( - "${FILESDIR}/${P}-cpu_features_check.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}" - - local options=( - # Preprocessor macros dependent on CPPFLAGS are checked. - --enable-sse2 - --enable-sse3 - --enable-ssse3 - --enable-sse4.1 - --enable-sse4.2 - --enable-sse4 - --enable-sse4a - --enable-popcnt - $(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 "${D}" -name "*.la" -type f -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 -} |