Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/snowball-stemmer/, dev-libs/snowball-stemmer/files/
Date: Mon, 22 Nov 2021 10:11:27
Message-Id: 1637575761.12db61e29d3ac4fba3cedd40acc98144d59119dd.sam@gentoo
1 commit: 12db61e29d3ac4fba3cedd40acc98144d59119dd
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Wed Nov 10 09:43:54 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 10:09:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12db61e2
7
8 dev-libs/snowball-stemmer: add 2.2.0
9
10 It was necessary to rebase shared-library patch due to changes in
11 snowball-stemmer GNUmakefile.
12
13 Upstream-issue: https://github.com/snowballstem/snowball/issues/34
14 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
15 Closes: https://github.com/gentoo/gentoo/pull/22880
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 dev-libs/snowball-stemmer/Manifest | 2 +
19 .../snowball-stemmer-2.2.0-shared-library.patch | 59 ++++++++++++++++++++++
20 .../snowball-stemmer/snowball-stemmer-2.2.0.ebuild | 53 +++++++++++++++++++
21 3 files changed, 114 insertions(+)
22
23 diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
24 index e388935a8378..b3ba23854621 100644
25 --- a/dev-libs/snowball-stemmer/Manifest
26 +++ b/dev-libs/snowball-stemmer/Manifest
27 @@ -1,2 +1,4 @@
28 +DIST snowball-data-0703f1d6a21802c3ff00c2c8b31bd255b74b2aec.tar.gz 33063873 BLAKE2B d4222f2dbf681c670017596c2510ca389a33c736e2b4deeda3f33559e9fdda7c86bd528f4b56fc124ef5c08818739576ef28b93b326505b6ad77259c4b638a4c SHA512 a5b3eb0d73dbefd243e6f5964071c83823e4b367b5a24a660aadffe6bcd3c2e855d5cc5edcd382a88e0edd270a7576388a04fb9141ae888776824c5a74b2beef
29 DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAKE2B bffc7e9f8fadbaecf9a7d1a2b8ee7a9db0b1dc1d5a6304a9c8d60b6c24a0947307b8780a99d2349b19e5fbcdfe819cc400ffb0b8b1df9748bb401ae1dec7b9aa SHA512 b68567d3e59aaa870251f682988b52a89d82767e954adea6b7f6247a6d432c29c8373c95a5e49df07110d4cb396aafa64ee6c71af2c0680d383ffe22491e50dd
30 DIST snowball-stemmer-2.1.0.tar.gz 220324 BLAKE2B 3d92a2f5b4bd633932d681f2555cf1cc1a2c1a1c71fd0272f09bee17628d034a20649450dd90242c155ab7b262e685913d5ad4034bce6e7a41d76f0dfc724137 SHA512 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
31 +DIST snowball-stemmer-2.2.0.tar.gz 223846 BLAKE2B ac06a603ab21dfe5508c1a51419568c15d61ad079a3cded98ca6a47716f4119e480b109756a107da1e6c9994062073cbfb29ac4feb3e5e4ffab6feb4db2b9930 SHA512 02c43313de9de2518ea51cfb11f1c29145fc046c7838329bfdefd70b604009ad44b6db8175c25b0db31f03db30a6aec5857aa35775a9c204ec976df9cae62957
32
33 diff --git a/dev-libs/snowball-stemmer/files/snowball-stemmer-2.2.0-shared-library.patch b/dev-libs/snowball-stemmer/files/snowball-stemmer-2.2.0-shared-library.patch
34 new file mode 100644
35 index 000000000000..4baa2281216c
36 --- /dev/null
37 +++ b/dev-libs/snowball-stemmer/files/snowball-stemmer-2.2.0-shared-library.patch
38 @@ -0,0 +1,59 @@
39 +This is based on a patch taken from alpinelinux, however, duplicated
40 +libstemmer.o and stemwords targets were removed and the patch was
41 +rebased on top of v2.2.0 tag.
42 +
43 +Created shared library contains a lot of relocations, which slow down loading.
44 +It is known issue and probably the main reason why upstream does not support
45 +shared library yet [1].
46 +
47 +[1] https://github.com/snowballstem/snowball/issues/34#issuecomment-203200078
48 +
49 +Alpinelinux-patch: https://git.alpinelinux.org/aports/tree/community/snowball/libstemmer-library.patch?id=28f9d9e192876c43fd96bc5856cd9d8a50dd49c0
50 +Upstream-issue: https://github.com/snowballstem/snowball/issues/34
51 +
52 +diff --git a/GNUmakefile b/GNUmakefile
53 +index 98eb1fa..9b539ec 100644
54 +--- a/GNUmakefile
55 ++++ b/GNUmakefile
56 +@@ -4,6 +4,8 @@
57 + # which hard-code it.
58 + SNOWBALL_VERSION = 2.2.0
59 +
60 ++MAJOR_VERSION := $(shell echo $(SNOWBALL_VERSION) | cut -d. -f1)
61 ++
62 + ifeq ($(OS),Windows_NT)
63 + EXEEXT = .exe
64 + endif
65 +@@ -170,12 +172,17 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o)
66 + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
67 + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
68 +
69 +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
70 +-CPPFLAGS=
71 ++CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations
72 ++CPPFLAGS+=
73 +
74 + INCLUDES=-Iinclude
75 +
76 +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
77 ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
78 ++
79 ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
80 ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR_VERSION),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
81 ++ ln -s $@.$(SNOWBALL_VERSION) $@.$(MAJOR_VERSION)
82 ++ ln -s $@.$(SNOWBALL_VERSION) $@
83 +
84 + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
85 + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
86 +diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map
87 +new file mode 100644
88 +index 0000000..7a3d423
89 +--- /dev/null
90 ++++ b/libstemmer/symbol.map
91 +@@ -0,0 +1,6 @@
92 ++SB_STEMMER_0 {
93 ++ global:
94 ++ sb_stemmer_*;
95 ++ local:
96 ++ *;
97 ++};
98
99 diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
100 new file mode 100644
101 index 000000000000..64f05cff45c2
102 --- /dev/null
103 +++ b/dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
104 @@ -0,0 +1,53 @@
105 +# Copyright 1999-2021 Gentoo Authors
106 +# Distributed under the terms of the GNU General Public License v2
107 +
108 +EAPI=8
109 +
110 +inherit toolchain-funcs
111 +
112 +MY_TESTDATA_COMMIT="0703f1d6a21802c3ff00c2c8b31bd255b74b2aec"
113 +
114 +DESCRIPTION="Snowball compiler and stemming algorithms"
115 +HOMEPAGE="https://snowballstem.org/ https://github.com/snowballstem/snowball/"
116 +SRC_URI="https://github.com/snowballstem/snowball/archive/v${PV}.tar.gz -> ${P}.tar.gz
117 + test? ( https://github.com/snowballstem/snowball-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> snowball-data-${MY_TESTDATA_COMMIT}.tar.gz )"
118 +
119 +LICENSE="BSD"
120 +SLOT="0/$(ver_cut 1)"
121 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
122 +IUSE="static-libs test"
123 +
124 +DEPEND=""
125 +RDEPEND="${DEPEND}"
126 +BDEPEND="dev-lang/perl
127 + test? ( virtual/libiconv )"
128 +RESTRICT="!test? ( test )"
129 +
130 +S="${WORKDIR}/snowball-${PV}"
131 +
132 +PATCHES=(
133 + "${FILESDIR}/${P}-shared-library.patch"
134 +)
135 +
136 +src_compile() {
137 + tc-export CC AR
138 + default
139 +}
140 +
141 +src_test() {
142 + emake -j1 STEMMING_DATA="${WORKDIR}/snowball-data-${MY_TESTDATA_COMMIT}" check
143 +}
144 +
145 +src_install() {
146 + dodoc README.rst NEWS
147 +
148 + dobin stemwords
149 +
150 + doheader include/libstemmer.h
151 +
152 + dolib.so libstemmer.so.${PV}
153 + dolib.so libstemmer.so.$(ver_cut 1)
154 + dolib.so libstemmer.so
155 +
156 + use static-libs && dolib.a libstemmer.a
157 +}