From 777943ff815951ed3d6b4cfbf67add0b07c5ecb5 Mon Sep 17 00:00:00 2001 From: "termux-actions[bot]" Date: Wed, 18 May 2022 15:23:40 +0000 Subject: [PATCH] packages/erlang --- packages/erlang/build.sh | 4 ++-- packages/erlang/prefix.patch | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index 8600c53651..0a38cf5196 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/ TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="24.3.4" +TERMUX_PKG_VERSION="25.0" TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=e59bedbb871af52244ca5284fd0a572d52128abd4decf4347fe2aef047b65c58 +TERMUX_PKG_SHA256=5988e3bca208486494446e885ca2149fe487ee115cbc3770535fd22a795af5d2 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_VERSION_REGEXP='\d+(\.\d+)+' TERMUX_PKG_DEPENDS="openssl, ncurses, zlib" diff --git a/packages/erlang/prefix.patch b/packages/erlang/prefix.patch index cef24ad5b3..f107f76682 100644 --- a/packages/erlang/prefix.patch +++ b/packages/erlang/prefix.patch @@ -1,13 +1,14 @@ -diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl -index 96b5da9..e166e89 100644 ---- a/lib/kernel/src/os.erl -+++ b/lib/kernel/src/os.erl -@@ -313,7 +313,7 @@ mk_cmd(_,Cmd) -> - %% We use an absolute path here because we do not want the path to be - %% searched in case a stale NFS handle is somewhere in the path before - %% the sh command. -- {"/bin/sh -s unix:cmd", [out], -+ {"@TERMUX_PREFIX@/bin/sh -s unix:cmd", [out], - %% We insert a new line after the command, in case the command - %% contains a comment character. - %% +--- ./lib/kernel/src/os.erl 2022-05-17 19:29:45.000000000 +0000 ++++ ./lib/kernel/src/os.erl 2022-05-18 14:34:43.819497497 +0000 +@@ -317,9 +317,9 @@ + %% Check if the default shell is located in /bin/sh as expected usually + %% or in /system/bin/sh as implemented on Android. The raw option is + %% used to bypass the file server and speed up the file access. +- Shell = case file:read_file_info("/bin/sh",[raw]) of ++ Shell = case file:read_file_info("@TERMUX_PREFIX@/bin/sh",[raw]) of + {ok,#file_info{type=regular}} -> +- "/bin/sh"; ++ "@TERMUX_PREFIX@/bin/sh"; + _ -> + case file:read_file_info("/system/bin/sh",[raw]) of + {ok,#file_info{type=regular}} ->