blade: Bump to 0.0.72

This commit is contained in:
Tee KOBAYASHI 2022-11-17 22:26:45 +09:00 committed by xtkoba
parent aad169032c
commit 9b2d5ae1e8
3 changed files with 22 additions and 8 deletions

View File

@ -1,11 +1,13 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -218,7 +218,7 @@ @@ -188,8 +188,8 @@
set(EXE_FILE "${OUTPUT_DIR}/blade${CMAKE_EXECUTABLE_SUFFIX}") set(EXE_FILE "${OUTPUT_DIR}/blade${CMAKE_EXECUTABLE_SUFFIX}")
add_custom_command(TARGET blade POST_BUILD 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/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/make_blade.b" "${PROJECT_SOURCE_DIR}"
COMMENT "Generating Blade header and folders..." + COMMAND blade "${PROJECT_SOURCE_DIR}/scripts/ast.b" "${OUTPUT_DIR}/libs/ast"
COMMENT "Generating Blade header and folders and package dependencies..."
) )

View File

@ -1,11 +1,12 @@
TERMUX_PKG_HOMEPAGE=https://bladelang.com/ TERMUX_PKG_HOMEPAGE=https://bladelang.com/
TERMUX_PKG_DESCRIPTION="A simple, fast, clean and dynamic language" TERMUX_PKG_DESCRIPTION="A simple, fast, clean and dynamic language"
TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.0.6 TERMUX_PKG_VERSION=0.0.72
TERMUX_PKG_SRCURL=https://github.com/blade-lang/blade/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/blade-lang/blade/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=3c13f2a81dc027871993e8a369691a470ed7f62b9fb4a72237ff75db36abe35d TERMUX_PKG_SHA256=541e8db24360e6bfda9bfb718a0a7bc884c8ca7ef1dc571be7ce9fddbc0b8f9d
TERMUX_PKG_DEPENDS="libsqlite, readline" TERMUX_PKG_BUILD_DEPENDS="libcurl, openssl"
TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_HOSTBUILD=true
termux_step_host_build() { termux_step_host_build() {
@ -15,7 +16,7 @@ termux_step_host_build() {
} }
termux_step_pre_configure() { termux_step_pre_configure() {
PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin:$PATH PATH=$TERMUX_PKG_HOSTBUILD_DIR/blade:$PATH
_NEED_DUMMY_LIBPTHREAD_A= _NEED_DUMMY_LIBPTHREAD_A=
_LIBPTHREAD_A=$TERMUX_PREFIX/lib/libpthread.a _LIBPTHREAD_A=$TERMUX_PREFIX/lib/libpthread.a
@ -26,7 +27,7 @@ termux_step_pre_configure() {
} }
termux_step_make_install() { termux_step_make_install() {
pushd bin pushd blade
install -Dm700 -t $TERMUX_PREFIX/bin blade install -Dm700 -t $TERMUX_PREFIX/bin blade
install -Dm600 -t $TERMUX_PREFIX/lib libblade.so install -Dm600 -t $TERMUX_PREFIX/lib libblade.so
local sharedir=$TERMUX_PREFIX/share/blade local sharedir=$TERMUX_PREFIX/share/blade

View File

@ -0,0 +1,11 @@
--- a/packages/ssl/CMakeLists.txt
+++ b/packages/ssl/CMakeLists.txt
@@ -17,7 +17,7 @@
target_link_libraries(ssl libblade)
add_dependencies(ssl blade)
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
set(OPENSSL_USE_STATIC_LIBS TRUE)
endif()
include(FindOpenSSL)