From e48e2ce37caae97c3b232b4e698257a076c9a93f Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 21 Feb 2024 11:09:05 +0000 Subject: [PATCH] upgpkg(main/mruby): 3.3.0 Signed-off-by: Kevin Williams --- packages/mruby/build.sh | 4 +- .../mruby/tasks-toolchains-android.rake.patch | 48 ++++--------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/packages/mruby/build.sh b/packages/mruby/build.sh index 492bfae250..f1cc061f0b 100644 --- a/packages/mruby/build.sh +++ b/packages/mruby/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mruby.org/ TERMUX_PKG_DESCRIPTION="Lightweight implementation of the Ruby language" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="3.2.0" +TERMUX_PKG_VERSION="3.3.0" TERMUX_PKG_SRCURL=https://github.com/mruby/mruby/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=3c198e4a31d31fe8524013066fac84a67fe6cd6067d92c25a1c79089744cb608 +TERMUX_PKG_SHA256=53088367e3d7657eb722ddfacb938f74aed1f8538b3717fe0b6eb8f58402af65 TERMUX_PKG_DEPENDS="libandroid-complex-math, readline" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/mruby/tasks-toolchains-android.rake.patch b/packages/mruby/tasks-toolchains-android.rake.patch index d1d648591d..84cb44c25c 100644 --- a/packages/mruby/tasks-toolchains-android.rake.patch +++ b/packages/mruby/tasks-toolchains-android.rake.patch @@ -1,48 +1,20 @@ --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake -@@ -252,7 +252,7 @@ - def ar - case toolchain - when :gcc then bin_gcc('ar') -- when :clang then bin_gcc('ar') -+ when :clang then bin('llvm-ar') - end - end +@@ -158,7 +158,7 @@ -@@ -271,7 +271,7 @@ - when /mips/ then flags += %W(-march=mips32) - end - when :clang -- case arch -+ case nil - when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v}) - when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v}) - when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v}) -@@ -282,7 +282,7 @@ - end - end - -- case arch -+ case nil - when /armeabi-v7a/ then flags += %W(-mfpu=#{armeabi_v7a_mfpu} -mfloat-abi=#{armeabi_v7a_mfloat_abi}) - when /armeabi/ then flags += %W(-mtune=xscale -msoft-float) - when /arm64-v8a/ then flags += %W() -@@ -254,7 +254,7 @@ - flags += ctarget + v = sdk_version case toolchain - when :gcc - when :clang -+ when nil - flags += %W(-gcc-toolchain "#{gcc_toolchain_path}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument) - end - flags += %W(-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes) -@@ -333,8 +331,7 @@ - when /armeabi-v7a/ then flags += %W(-Wl#{no_warn_mismatch}) - end ++ when :nil + case arch + when /armeabi-v7a/ then flags += %W(-target armv7a-linux-androideabi#{v} -mfpu=#{armeabi_v7a_mfpu} -mfloat-abi=#{armeabi_v7a_mfloat_abi}) + when /arm64-v8a/ then flags += %W(-target aarch64-linux-android#{v}) +@@ -198,7 +198,7 @@ + v = sdk_version + case toolchain when :clang -- flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}") - case arch + case nil when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v} -Wl,--fix-cortex-a8#{no_warn_mismatch}) - when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v}) when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v}) + when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})