From 928bc7d793a3cc10323cb67a6dcf5ce13b82ce55 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 10 Mar 2022 23:45:57 +0900 Subject: [PATCH] erlang: Update to 24.3 Upstream is now aware of shm unavailability. --- packages/erlang/build.sh | 5 +- .../erlang/emulator-asmjit-virtmem-shm.patch | 47 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index 204911920..ac4299f9a 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -2,10 +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.2.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=24.3 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=b6adfc0bf14d94348146ae26cc38d09dca545f8e14ebab7ddcf9482a6e8d1162 +TERMUX_PKG_SHA256=82e821102a083073e7e088961bcd98b9f5fc4608b05702d8c36a9c7d917e8d71 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+(\.\d+)+" TERMUX_PKG_DEPENDS="openssl, ncurses, zlib" diff --git a/packages/erlang/emulator-asmjit-virtmem-shm.patch b/packages/erlang/emulator-asmjit-virtmem-shm.patch index 40d60cb24..537bb3720 100644 --- a/packages/erlang/emulator-asmjit-virtmem-shm.patch +++ b/packages/erlang/emulator-asmjit-virtmem-shm.patch @@ -2,37 +2,6 @@ diff --git a/erts/emulator/asmjit/core/virtmem.cpp b/erts/emulator/asmjit/core/v index a1b0f95..d1eb1ad 100644 --- a/erts/emulator/asmjit/core/virtmem.cpp +++ b/erts/emulator/asmjit/core/virtmem.cpp -@@ -62,12 +62,18 @@ - - #include - --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined(__ANDROID__) - #define ASMJIT_VM_SHM_DETECT 0 - #else - #define ASMJIT_VM_SHM_DETECT 1 - #endif - -+#if defined(__ANDROID__) -+ #define ASMJIT_VM_SHM_AVAILABLE 0 -+#else -+ #define ASMJIT_VM_SHM_AVAILABLE 1 -+#endif -+ - ASMJIT_BEGIN_NAMESPACE - - // ============================================================================ -@@ -258,8 +264,10 @@ public: - - if (type == kFileTypeTmp) - return unlink(tmpName.data()); -+#if ASMJIT_VM_SHM_AVAILABLE - else if (type == kFileTypeShm) - return shm_unlink(tmpName.data()); -+#endif - else - return 0; - } @@ -388,7 +396,7 @@ static ASMJIT_INLINE int VirtMem_appleSpecificMMapFlags(uint32_t flags) noexcept #if !defined(SHM_ANON) static const char* VirtMem_getTmpDir() noexcept { @@ -42,19 +11,3 @@ index a1b0f95..d1eb1ad 100644 } #endif -@@ -448,6 +456,7 @@ static Error VirtMem_openAnonymousMemory(AnonymousMemory* anonMem, bool preferTm - return kErrorOk; - } - } -+#if ASMJIT_VM_SHM_AVAILABLE - else { - anonMem->tmpName.assignFormat(kShmFormat, (unsigned long long)bits); - anonMem->fd = shm_open(anonMem->tmpName.data(), O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); -@@ -456,6 +465,7 @@ static Error VirtMem_openAnonymousMemory(AnonymousMemory* anonMem, bool preferTm - return kErrorOk; - } - } -+#endif - - int e = errno; - if (e != EEXIST)