Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(main/crystal): Do not use `src/llvm/ext/llvm_ext.o` (#19720)

This commit is contained in:
Quinton Miller 2024-04-10 22:51:53 +08:00 committed by GitHub
parent a82c835ba4
commit f8ec6e4281
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/crystal/build.sh
View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://crystal-lang.org
TERMUX_PKG_DESCRIPTION="Fast and statically typed, compiled language with Ruby-like syntax"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@HertzDevil"
TERMUX_PKG_VERSION="1.11.2"
TERMUX_PKG_VERSION="1.12.0"
TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
TERMUX_PKG_SRCURL=git+https://github.com/crystal-lang/crystal
TERMUX_PKG_AUTO_UPDATE=true
@ -14,7 +14,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686, x86_64"
termux_step_make() {
local SHARDS_VERSION=0.17.3
local SHARDS_VERSION=0.18.0
local MOLINILLO_VERSION=0.2.0
local MOLINILLO_URL=https://github.com/crystal-lang/crystal-molinillo/archive/v$MOLINILLO_VERSION.tar.gz
local MOLINILLO_TARFILE=$TERMUX_PKG_TMPDIR/crystal-molinillo-$MOLINILLO_VERSION.tar.gz
@ -25,7 +25,7 @@ termux_step_make() {
CC="$CC_FOR_BUILD" ANDROID_PLATFORM="$TERMUX_PKG_API_LEVEL" LLVM_CONFIG="$TERMUX_PREFIX/bin/llvm-config" \
make crystal target=$TERMUX_HOST_PLATFORM release=1 FLAGS=-Dwithout_iconv
$CC .build/crystal.o -o .build/crystal $LDFLAGS -rdynamic src/llvm/ext/llvm_ext.o \
$CC .build/crystal.o -o .build/crystal $LDFLAGS -rdynamic \
$("$TERMUX_PREFIX/bin/llvm-config" --libs --system-libs --ldflags 2> /dev/null) \
-lstdc++ -lpcre2-8 -lm -lgc -levent -ldl
@ -45,6 +45,6 @@ termux_step_make() {
}
termux_step_make_install() {
make install PREFIX="$TERMUX_PREFIX"
LLVM_CONFIG="$TERMUX_PREFIX/bin/llvm-config" make install PREFIX="$TERMUX_PREFIX"
cd shards && make install PREFIX="$TERMUX_PREFIX"
}

4
scripts/build/setup/termux_setup_crystal.sh
View File

@ -1,6 +1,6 @@
termux_setup_crystal() {
local TERMUX_CRYSTAL_VERSION=1.10.1
local TERMUX_CRYSTAL_SHA256=bd74b24cac07f6227ee0874c6d9264688ca4388a0a8687493e4ca04285454912
local TERMUX_CRYSTAL_VERSION=1.12.0
local TERMUX_CRYSTAL_SHA256=d0c9237e8f0bb8c176545019b2296b65451fb29e2b4c7585986a3f9a4bcc1cb3
local TERMUX_CRYSTAL_TARNAME=crystal-${TERMUX_CRYSTAL_VERSION}-1-linux-x86_64-bundled.tar.gz
local TERMUX_CRYSTAL_TARFILE=$TERMUX_PKG_TMPDIR/crystal-$TERMUX_CRYSTAL_VERSION.tar.gz
local TERMUX_CRYSTAL_FOLDER