Date: Tuesday, September 10, 2019 @ 19:18:05 Author: heftig Revision: 362146
0+713-1 Modified: snowball/trunk/PKGBUILD snowball/trunk/dynamiclib.patch ------------------+ PKGBUILD | 16 +++++++------- dynamiclib.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-10 19:02:30 UTC (rev 362145) +++ PKGBUILD 2019-09-10 19:18:05 UTC (rev 362146) @@ -2,8 +2,8 @@ pkgbase=snowball pkgname=(snowball libstemmer) -pkgver=0+337 -pkgrel=3 +pkgver=0+713 +pkgrel=1 pkgdesc="String processing language for creating stemming algorithms" arch=(x86_64) url="https://snowballstem.org/"; @@ -10,20 +10,20 @@ license=(BSD) depends=(glibc) makedepends=(git) -_commit=fc2adaa96b0561506e6c1a80d73de7f4e0fa9663 +_commit=8c73aa900e168a96e046ec9ed6f13739c3dfacb0 # master source=("git+https://github.com/snowballstem/snowball#commit=$_commit"; dynamiclib.patch) sha256sums=('SKIP' - '99511a11cdeeb1ef1eaa9d7b777f6934693d4696ba9523de40b886f7d898058e') + 'ea34c201bf619d14b0eb1207589641ca1f1cb8131efb4b422b3dd3501c49231e') -prepare() { +pkgver() { cd $pkgbase - patch -Np1 -i ../dynamiclib.patch + echo "0+$(git rev-list --count HEAD)" } -pkgver() { +prepare() { cd $pkgbase - echo "0+$(git rev-list --count HEAD)" + patch -Np1 -i ../dynamiclib.patch } build() { Modified: dynamiclib.patch =================================================================== --- dynamiclib.patch 2019-09-10 19:02:30 UTC (rev 362145) +++ dynamiclib.patch 2019-09-10 19:18:05 UTC (rev 362146) @@ -1,14 +1,19 @@ + GNUmakefile | 13 ++++++++----- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 14 insertions(+), 5 deletions(-) + diff --git c/GNUmakefile i/GNUmakefile -index 1693f5a..b33a42e 100644 +index d100917..d9eb543 100644 --- c/GNUmakefile +++ i/GNUmakefile -@@ -112,10 +112,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) +@@ -144,58 +144,61 @@ 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 -+CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations - CPPFLAGS=-Iinclude +-CPPFLAGS=-Iinclude ++CFLAGS+=-fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CPPFLAGS+=-Iinclude -all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) +all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) @@ -15,7 +20,47 @@ clean: rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -158,6 +158,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) + $(LIBSTEMMER_OBJECTS) $(LIBSTEMMER_UTF8_OBJECTS) $(STEMWORDS_OBJECTS) snowball \ + libstemmer.o stemwords \ + libstemmer/modules.h \ + libstemmer/modules_utf8.h \ + snowball.splint \ + $(C_LIB_SOURCES) $(C_LIB_HEADERS) $(C_LIB_OBJECTS) \ + $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) \ + $(JAVA_SOURCES) $(JAVA_CLASSES) $(JAVA_RUNTIME_CLASSES) \ + $(CSHARP_SOURCES) \ + $(PASCAL_SOURCES) pascal/stemwords.dpr pascal/stemwords pascal/*.o pascal/*.ppu \ + $(PYTHON_SOURCES) \ + $(JS_SOURCES) \ + $(RUST_SOURCES) \ + libstemmer/mkinc.mak libstemmer/mkinc_utf8.mak \ + libstemmer/libstemmer.c libstemmer/libstemmer_utf8.c \ + algorithms.mk + rm -rf dist + rmdir $(c_src_dir) || true + rmdir $(python_output_dir) || true + rmdir $(js_output_dir) || true + + snowball: $(COMPILER_OBJECTS) +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + $(COMPILER_OBJECTS): $(COMPILER_HEADERS) + + libstemmer/libstemmer.c: libstemmer/libstemmer_c.in + sed 's/@MODULES_H@/modules.h/' $^ >$@ + + libstemmer/libstemmer_utf8.c: libstemmer/libstemmer_c.in + sed 's/@MODULES_H@/modules_utf8.h/' $^ >$@ + + libstemmer/modules.h libstemmer/mkinc.mak: libstemmer/mkmodules.pl libstemmer/modules.txt + libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc.mak + + libstemmer/modules_utf8.h libstemmer/mkinc_utf8.mak: libstemmer/mkmodules.pl libstemmer/modules.txt + libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc_utf8.mak utf8 + + libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) + libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) $(AR) -cru $@ $^ @@ -23,8 +68,11 @@ + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o [email protected] $^ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) -o $@ $^ +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) + $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) diff --git c/libstemmer/symbol.map i/libstemmer/symbol.map new file mode 100644 index 0000000..7a3d423
