blade: Bump to 0.0.81

This commit is contained in:
Tee KOBAYASHI 2023-02-01 07:05:53 +09:00 committed by xtkoba
parent 812c0df29b
commit 6e2e845cdc
6 changed files with 42 additions and 19 deletions

View File

@ -1,13 +1,13 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,8 +188,8 @@
set(EXE_FILE "${OUTPUT_DIR}/blade${CMAKE_EXECUTABLE_SUFFIX}")
add_custom_command(TARGET blade POST_BUILD
- COMMAND "${EXE_FILE}" "${PROJECT_SOURCE_DIR}/scripts/make_blade.b" "${PROJECT_SOURCE_DIR}"
- COMMAND "${EXE_FILE}" "${PROJECT_SOURCE_DIR}/scripts/ast.b" "${OUTPUT_DIR}/libs/ast"
+ COMMAND blade "${PROJECT_SOURCE_DIR}/scripts/make_blade.b" "${PROJECT_SOURCE_DIR}"
+ COMMAND blade "${PROJECT_SOURCE_DIR}/scripts/ast.b" "${OUTPUT_DIR}/libs/ast"
COMMENT "Generating Blade header and folders and package dependencies..."
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:blade> ${EXE_FILE}
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:libblade> ${LIBRARY_FILE}
- COMMAND ${EXE_FILE} "${PROJECT_SOURCE_DIR}/scripts/make_blade.b" "${PROJECT_SOURCE_DIR}"
- COMMAND ${EXE_FILE} "${PROJECT_SOURCE_DIR}/scripts/ast.b" "${OUTPUT_DIR}/libs/ast"
+ COMMAND blade "${PROJECT_SOURCE_DIR}/scripts/make_blade.b" "${PROJECT_SOURCE_DIR}"
+ COMMAND blade "${PROJECT_SOURCE_DIR}/scripts/ast.b" "${OUTPUT_DIR}/libs/ast"
COMMENT "Generating Blade header and copy output..."
)

View File

@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="A simple, fast, clean and dynamic language"
TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.0.72
TERMUX_PKG_VERSION=0.0.81
TERMUX_PKG_SRCURL=https://github.com/blade-lang/blade/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=541e8db24360e6bfda9bfb718a0a7bc884c8ca7ef1dc571be7ce9fddbc0b8f9d
TERMUX_PKG_SHA256=a149db8c8d667d7834039f005c720bfbe0651e6f1e34ec9ec7ea74d425e73a82
TERMUX_PKG_BUILD_DEPENDS="libcurl, openssl"
TERMUX_PKG_HOSTBUILD=true
@ -17,6 +17,7 @@ termux_step_host_build() {
termux_step_pre_configure() {
PATH=$TERMUX_PKG_HOSTBUILD_DIR/blade:$PATH
export LD_LIBRARY_PATH=$TERMUX_PKG_HOSTBUILD_DIR/blade
_NEED_DUMMY_LIBPTHREAD_A=
_LIBPTHREAD_A=$TERMUX_PREFIX/lib/libpthread.a

View File

@ -0,0 +1,11 @@
--- a/packages/zlib/CMakeLists.txt
+++ b/packages/zlib/CMakeLists.txt
@@ -22,7 +22,7 @@
target_link_libraries(zlib2 libblade)
add_dependencies(zlib2 blade)
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
set(ZLIB_USE_STATIC_LIBS ON)
endif()
include(FindZLIB)

View File

@ -1,5 +1,5 @@
--- a/src/blade_file.c
+++ b/src/blade_file.c
+++ b/src/file.c
@@ -23,6 +23,15 @@
#endif /* ifdef HAVE_SYS_TIME_H */
#include <time.h>

View File

@ -1,20 +1,20 @@
--- a/src/standard/io.c
+++ b/src/standard/io.c
@@ -54,8 +54,10 @@
dict_add_entry(vm, dict, NUMBER_VAL(1), NUMBER_VAL(raw_attr.c_oflag));
@@ -107,8 +107,10 @@
dict_add_entry(vm, dict, NUMBER_VAL(2), NUMBER_VAL(raw_attr.c_cflag));
dict_add_entry(vm, dict, NUMBER_VAL(3), NUMBER_VAL(raw_attr.c_lflag));
#if !defined(__MUSL__)
+#ifndef __ANDROID__
dict_add_entry(vm, dict, NUMBER_VAL(4), NUMBER_VAL(raw_attr.c_ispeed));
dict_add_entry(vm, dict, NUMBER_VAL(5), NUMBER_VAL(raw_attr.c_ospeed));
+#endif
RETURN_OBJ(dict);
#else
@@ -125,12 +127,14 @@
if (dict_get_entry(dict, NUMBER_VAL(3), &iflag)) {
dict_add_entry(vm, dict, NUMBER_VAL(4), NUMBER_VAL(raw_attr.__c_ispeed));
dict_add_entry(vm, dict, NUMBER_VAL(5), NUMBER_VAL(raw_attr.__c_ospeed));
@@ -183,12 +185,14 @@
raw.c_lflag = (long) AS_NUMBER(lflag);
}
#if !defined(__MUSL__)
+#ifndef __ANDROID__
if (dict_get_entry(dict, NUMBER_VAL(4), &iflag)) {
raw.c_ispeed = (long) AS_NUMBER(ispeed);
@ -23,6 +23,6 @@
raw.c_ospeed = (long) AS_NUMBER(ospeed);
}
+#endif
set_attr_was_called = true;
#else
if (dict_get_entry(dict, NUMBER_VAL(4), &iflag)) {
raw.__c_ispeed = (long) AS_NUMBER(ispeed);

View File

@ -0,0 +1,11 @@
--- a/src/standard/process.c
+++ b/src/standard/process.c
@@ -2,7 +2,7 @@
#ifdef HAVE_SYSCONF
#include <sys/ipc.h>
-#include <sys/shm.h>
+#include <linux/shm.h>
#endif
#ifdef HAVE_SYSCTLBYNAME
#include <sys/sysctl.h>