From 9a79262b56dccb7b2405ebf07343ed21e3eb86b8 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 14 Aug 2022 21:29:33 +0200 Subject: [PATCH] chore(main/libstemmer): keep patch in repo instead of downloading --- packages/libstemmer/build.sh | 11 +--- ...nowball-stemmer-2.2.0-shared-library.patch | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 packages/libstemmer/snowball-stemmer-2.2.0-shared-library.patch diff --git a/packages/libstemmer/build.sh b/packages/libstemmer/build.sh index 79d85611c7..7565671345 100644 --- a/packages/libstemmer/build.sh +++ b/packages/libstemmer/build.sh @@ -3,20 +3,11 @@ TERMUX_PKG_DESCRIPTION="Snowball compiler and stemming algorithms" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/snowballstem/snowball/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=425cdb5fba13a01db59a1713780f0662e984204f402d3dae1525bda9e6d30f1a TERMUX_PKG_BUILD_IN_SRC=true -termux_step_post_get_source() { - local patch_url="https://github.com/gentoo/gentoo/raw/705bd7479a5a30cb75fc5bb29155f02c2d6b1ad6/dev-libs/snowball-stemmer/files/snowball-stemmer-2.2.0-shared-library.patch" - local patch_filename="$(basename $patch_url)" - termux_download \ - "$patch_url" \ - $TERMUX_PKG_CACHEDIR/"$patch_filename" \ - 7695286b9fd0ad7c4db01fb4def3dc047bdfa20d3fcc1902959d8c4e6848e703 - cat $TERMUX_PKG_CACHEDIR/"$patch_filename" | patch --silent -p1 -} - termux_step_make_install() { install -Dm700 -t $TERMUX_PREFIX/bin stemwords install -Dm600 -t $TERMUX_PREFIX/include include/libstemmer.h diff --git a/packages/libstemmer/snowball-stemmer-2.2.0-shared-library.patch b/packages/libstemmer/snowball-stemmer-2.2.0-shared-library.patch new file mode 100644 index 0000000000..4baa228121 --- /dev/null +++ b/packages/libstemmer/snowball-stemmer-2.2.0-shared-library.patch @@ -0,0 +1,59 @@ +This is based on a patch taken from alpinelinux, however, duplicated +libstemmer.o and stemwords targets were removed and the patch was +rebased on top of v2.2.0 tag. + +Created shared library contains a lot of relocations, which slow down loading. +It is known issue and probably the main reason why upstream does not support +shared library yet [1]. + +[1] https://github.com/snowballstem/snowball/issues/34#issuecomment-203200078 + +Alpinelinux-patch: https://git.alpinelinux.org/aports/tree/community/snowball/libstemmer-library.patch?id=28f9d9e192876c43fd96bc5856cd9d8a50dd49c0 +Upstream-issue: https://github.com/snowballstem/snowball/issues/34 + +diff --git a/GNUmakefile b/GNUmakefile +index 98eb1fa..9b539ec 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -4,6 +4,8 @@ + # which hard-code it. + SNOWBALL_VERSION = 2.2.0 + ++MAJOR_VERSION := $(shell echo $(SNOWBALL_VERSION) | cut -d. -f1) ++ + ifeq ($(OS),Windows_NT) + EXEEXT = .exe + endif +@@ -170,12 +172,17 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations +-CPPFLAGS= ++CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CPPFLAGS+= + + INCLUDES=-Iinclude + +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++ ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR_VERSION),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^ ++ ln -s $@.$(SNOWBALL_VERSION) $@.$(MAJOR_VERSION) ++ ln -s $@.$(SNOWBALL_VERSION) $@ + + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map +new file mode 100644 +index 0000000..7a3d423 +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++};