bump(main/fennel): 1.4.2

This commit is contained in:
tqfx 2024-04-20 11:10:29 +08:00 committed by Kevin Williams
parent 7df1d1f7e3
commit baccbb078c
2 changed files with 17 additions and 14 deletions

View File

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index d48a66c..444fa06 100644
index 8541b8c..78432f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
@@ -1,5 +1,5 @@
-LUA ?= lua
-LUA_VERSION ?= $(shell $(LUA) -e 'v=_VERSION:gsub("^Lua *","");print(v)')
+LUA_VERSION ?= 5.3
@ -10,18 +10,21 @@ index d48a66c..444fa06 100644
DESTDIR ?=
PREFIX ?= /usr/local
BIN_DIR ?= $(PREFIX)/bin
LUA_LIB_DIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)
-MAN_DIR ?= $(PREFIX)/man/man1
+MAN_DIR ?= $(PREFIX)/share/man/man1
@@ -18,7 +18,7 @@ SRC=$(LIB_SRC) src/launcher.fnl src/fennel/binary.fnl
MINI_SRC=src/fennel.fnl src/fennel/parser.fnl src/fennel/specials.fnl \
src/fennel/utils.fnl src/fennel/compiler.fnl src/fennel/macros.fnl
@@ -60,7 +60,7 @@ lint: fennel
MAN_PANDOC := pandoc -f gfm -t man -s --lua-filter=build/manfilter.lua \
--metadata author="Fennel Maintainers" \
- --variable footer="fennel $(shell ./fennel -e '(. (require :fennel) :version)')"
+ --variable footer="fennel"
unexport NO_COLOR # this causes test failures
unexport FENNEL_PATH FENNEL_MACRO_PATH # ensure isolation
@@ -74,7 +74,7 @@ check:
## Binaries
-BIN_LUA_VERSION=5.4.4
+BIN_LUA_VERSION=5.3.6
-BIN_LUA_VERSION ?= 5.4.6
+BIN_LUA_VERSION ?= 5.3.6
BIN_LUAJIT_VERSION ?= 2.0.5
BIN_LUA_DIR ?= $(PWD)/lua-$(BIN_LUA_VERSION)
NATIVE_LUA_LIB ?= $(BIN_LUA_DIR)/src/liblua-native.a
LUA_INCLUDE_DIR ?= $(BIN_LUA_DIR)/src
BIN_LUAJIT_DIR ?= $(PWD)/LuaJIT-$(BIN_LUAJIT_VERSION)

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE="https://fennel-lang.org"
TERMUX_PKG_DESCRIPTION="A Lisp that compiles to Lua"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.3.0
TERMUX_PKG_VERSION=1.4.2
TERMUX_PKG_SRCURL="https://github.com/bakpakin/Fennel/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=bae4a658b50f6febbaa6183c89208aae4459531fa15e137c0eb8ff98684eb7c3
TERMUX_PKG_SHA256=b44a205ee7ebdee22f83d2a7a87742172295b8086b5361850dfab4f49699e44f
TERMUX_PKG_DEPENDS="lua53"
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_BUILD_IN_SRC=true