diff --git a/packages/libwren/build.sh b/packages/libwren/build.sh index 590ac0ce8..16ae2279a 100644 --- a/packages/libwren/build.sh +++ b/packages/libwren/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small, fast, class-based concurrent scripting language l TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/wren-lang/wren/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=23c0ddeb6c67a4ed9285bded49f7c91714922c2e7bb88f42428386bf1cf7b339 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libwren/projects-make-wren_test.make.patch b/packages/libwren/projects-make-wren_test.make.patch deleted file mode 100644 index 4351f5da6..000000000 --- a/packages/libwren/projects-make-wren_test.make.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/projects/make/wren_test.make b/projects/make/wren_test.make -index 6d8c6383..8309bf5b 100644 ---- a/projects/make/wren_test.make -+++ b/projects/make/wren_test.make -@@ -40,7 +40,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 - LIBS += ../../lib/libwren.a -lm - LDDEPS += ../../lib/libwren.a --ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s -+ALL_LDFLAGS += $(LDFLAGS) -m64 -s - - else ifeq ($(config),release_32bit) - TARGETDIR = ../../bin -@@ -51,7 +51,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 - LIBS += ../../lib/libwren.a -lm - LDDEPS += ../../lib/libwren.a --ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s -+ALL_LDFLAGS += $(LDFLAGS) -m32 -s - - else ifeq ($(config),release_64bit-no-nan-tagging) - TARGETDIR = ../../bin diff --git a/packages/libwren/projects-make.patch b/packages/libwren/projects-make.patch new file mode 100644 index 000000000..3de987809 --- /dev/null +++ b/packages/libwren/projects-make.patch @@ -0,0 +1,62 @@ +diff --git a/projects/make/wren_test.make b/projects/make/wren_test.make +index 6d8c6383..8309bf5b 100644 +--- a/projects/make/wren_test.make ++++ b/projects/make/wren_test.make +@@ -40,7 +40,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 + LIBS += ../../lib/libwren.a -lm + LDDEPS += ../../lib/libwren.a +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../bin +@@ -51,7 +51,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 + LIBS += ../../lib/libwren.a -lm + LDDEPS += ../../lib/libwren.a +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../bin +--- ../wren.make.orig 2021-09-22 16:33:01.100347594 +0200 ++++ ./projects/make/wren.make 2021-09-22 16:33:36.664323142 +0200 +@@ -40,7 +40,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../lib +@@ -49,7 +49,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../lib +--- ../wren_shared.make.orig 2021-09-22 16:34:05.898184395 +0200 ++++ ./projects/make/wren_shared.make 2021-09-22 16:34:22.975159452 +0200 +@@ -40,7 +40,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -shared -Wl,-soname=libwren.so -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -shared -Wl,-soname=libwren.so -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../lib +@@ -49,7 +49,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -shared -Wl,-soname=libwren.so -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -shared -Wl,-soname=libwren.so -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../lib