fennel: Bump to 1.2.1

This commit is contained in:
Tee KOBAYASHI 2022-11-23 18:53:01 +09:00 committed by xtkoba
parent ed984bceeb
commit b17786b75b
2 changed files with 13 additions and 6 deletions

View File

@ -2,19 +2,26 @@ diff --git a/Makefile b/Makefile
index d48a66c..444fa06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
LUA ?= lua
@@ -1,10 +1,10 @@
-LUA ?= lua
-LUA_VERSION ?= $(shell $(LUA) -e 'v=_VERSION:gsub("^Lua *","");print(v)')
+LUA_VERSION ?= 5.3
+LUA ?= lua$(LUA_VERSION)
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
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
## Binaries
-BIN_LUA_VERSION=5.4.4
+BIN_LUA_VERSION=5.3.5
+BIN_LUA_VERSION=5.3.6
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

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.2.0"
TERMUX_PKG_VERSION="1.2.1"
TERMUX_PKG_SRCURL="https://github.com/bakpakin/Fennel/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=a0c9b1d23d9d9714afe93542c5314fad8e1771bf8b616d0decfeabe88318313e
TERMUX_PKG_BUILD_DEPENDS="lua53"
TERMUX_PKG_SHA256=fae8a0b00275529acb3785673b9505f378786ccd2cd2bc16254f6a5fd08e0d19
TERMUX_PKG_DEPENDS="lua53"
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_BUILD_IN_SRC=true