diff --git a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch index 356ef8b469..99799e0019 100644 --- a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch +++ b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -14,38 +14,38 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - GNUmakefile | 7 +++++-- - libstemmer/symbol.map | 6 ++++++ + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 libstemmer/symbol.map --- a/GNUmakefile +++ b/GNUmakefile -@@ -311,12 +311,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=. +@@ -332,12 +332,12 @@ JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) JAVA_RUNTIME_CLASSES=$(JAVA_RUNTIME_SOURCES:.java=.class) - + -CFLAGS=-g -O2 -W -Wall -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wshadow $(WERROR) +CFLAGS=-g -O2 -fPIC -W -Wall -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wshadow $(WERROR) 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) - + algorithms.mk: GNUmakefile libstemmer/mkalgorithms.pl $(MODULES) libstemmer/mkalgorithms.pl algorithms.mk $(MODULES) -@@ -424,6 +424,9 @@ libstemmer/libstemmer.o: libstemmer/modu +@@ -447,6 +447,9 @@ libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) - $(AR) $(ARFLAGS) $@ $^ - + $(AR) $(ARFLAGS_)$@ $^ + +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + examples/%.o: examples/%.c - $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< - + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c $(o_for_obj) $@ $< + --- /dev/null +++ b/libstemmer/symbol.map @@ -0,0 +1,6 @@ diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_3.1.1.bb b/meta-oe/recipes-support/libstemmer/libstemmer_3.2.0.bb similarity index 96% rename from meta-oe/recipes-support/libstemmer/libstemmer_3.1.1.bb rename to meta-oe/recipes-support/libstemmer/libstemmer_3.2.0.bb index 0e74366268..4cf7724d15 100644 --- a/meta-oe/recipes-support/libstemmer/libstemmer_3.1.1.bb +++ b/meta-oe/recipes-support/libstemmer/libstemmer_3.2.0.bb @@ -8,7 +8,7 @@ DEPENDS:append:class-target = " ${BPN}-native" SRC_URI = "git://github.com/snowballstem/snowball.git;branch=main;protocol=https;tag=v${PV} \ file://0001-Build-so-lib.patch \ " -SRCREV = "cd195b51e948a902a4312f023f4a14392516a543" +SRCREV = "6389c79f91cd67ed2de3ebdcf84ec8c2d2d23c11" LIBVER = "0.0.0"