sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nim: update to 1.6.4 (#9276)

Browse Source
This commit is contained in:
Arun 2022-03-06 04:55:50 +05:30 committed by GitHub
parent 5479e6bd1d
commit 8830175dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/nim/build.sh
View File

@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Nim programming language compiler"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="copying.txt"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.6.0
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION=1.6.4
TERMUX_PKG_SRCURL=https://nim-lang.org/download/nim-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=52065d48d72a72702ec1afe5f7a9831e11673531e279cdff9caec01a07eec63d
TERMUX_PKG_SHA256=7fc3092855b5c2200cd9feed133d04605823f250d73b4d4ac501300370e0a0c2
TERMUX_PKG_DEPENDS="clang, git, libandroid-glob"
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_BUILD_IN_SRC=true
@ -57,7 +56,7 @@ termux_step_make() {
koch) nim_flags="--opt:size" ;;
*) nim_flags= ;;
esac
nim --cc:clang --clang.exe=$CC --clang.linkerexe=$CC $nim_flags --define:termux -d:release --os:android --cpu:$NIM_ARCH -t:"$CPPFLAGS $CFLAGS" -l:"$LDFLAGS -landroid-glob" -d:tempDir:$TERMUX_PREFIX/tmp c $(basename $cmd).nim
nim --cc:clang --clang.exe=$CC --clang.linkerexe=$CC $nim_flags --define:termux -d:release -d:sslVersion=1.1 --os:android --cpu:$NIM_ARCH -t:"$CPPFLAGS $CFLAGS" -l:"$LDFLAGS -landroid-glob" -d:tempDir:$TERMUX_PREFIX/tmp c $(basename $cmd).nim
popd
done
}

25
packages/nim/config-nim.cfg.patch
View File

@ -1,18 +1,23 @@
diff -uNr nim-1.4.0/config/nim.cfg nim-1.4.0.mod/config/nim.cfg
--- nim-1.4.0/config/nim.cfg 2020-10-30 15:23:34.955027000 +0100
+++ nim-1.4.0.mod/config/nim.cfg 2020-10-30 15:22:59.586260700 +0100
@@ -136,13 +136,13 @@
diff -uNr nim-1.6.4/config/nim.cfg nim-1.6.4.mod/config/nim.cfg
--- nim-1.6.4/config/nim.cfg 2022-02-09 06:12:37.000000000 +0530
+++ nim-1.6.4.mod/config/nim.cfg 2022-03-05 12:08:06.184549530 +0530
@@ -130,13 +130,13 @@
@if android:
cc = clang
- @if termux:
+# @if termux:
gcc.options.linker = "-landroid-glob"
gcc.cpp.options.linker = "-landroid-glob"
clang.options.linker = "-landroid-glob"
clang.cpp.options.linker = "-landroid-glob"
tcc.options.linker = "-landroid-glob"
- gcc.options.linker = "-landroid-glob"
- gcc.cpp.options.linker = "-landroid-glob"
- clang.options.linker = "-landroid-glob"
- clang.cpp.options.linker = "-landroid-glob"
- tcc.options.linker = "-landroid-glob"
- @end
+# @if termux:
+ gcc.options.linker = "-landroid-glob -Wl,-rpath=@TERMUX_PREFIX@/lib/openssl-1.1"
+ gcc.cpp.options.linker = "-landroid-glob -Wl,-rpath=@TERMUX_PREFIX@/lib/openssl-1.1"
+ clang.options.linker = "-landroid-glob -Wl,-rpath=@TERMUX_PREFIX@/lib/openssl-1.1"
+ clang.cpp.options.linker = "-landroid-glob -Wl,-rpath=@TERMUX_PREFIX@/lib/openssl-1.1"
+ tcc.options.linker = "-landroid-glob -Wl,-rpath=@TERMUX_PREFIX@/lib/openssl-1.1"
+# @end
@end