diff --git a/packages/mruby/build.sh b/packages/mruby/build.sh index c58ebe4558..8744b427a2 100644 --- a/packages/mruby/build.sh +++ b/packages/mruby/build.sh @@ -2,10 +2,10 @@ 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.1.0 +TERMUX_PKG_VERSION=3.2.0 TERMUX_PKG_SRCURL=https://github.com/mruby/mruby/archive/${TERMUX_PKG_VERSION}.zip -TERMUX_PKG_SHA256=826d8410f2a6965846679f0aa53234eeb20c9d9483fa714835937492197d2677 -TERMUX_PKG_DEPENDS="readline" +TERMUX_PKG_SHA256=64a0dd8b65825f2e7cdac6699e818648dc73bfdfc68aa1bfd58417a35315e5cc +TERMUX_PKG_DEPENDS="libandroid-complex-math, readline" TERMUX_PKG_BUILD_IN_SRC=true termux_step_make() { @@ -16,6 +16,7 @@ termux_step_make() { -DMRB_READLINE_HISTORY=\\ \ " export LDFLAGS_FOR_TARGET="$LDFLAGS -lncurses -lreadline" + LDFLAGS_FOR_TARGET+=" -landroid-complex-math" unset CPPFLAGS CFLAGS LDFLAGS export CC="$CC_FOR_BUILD" export LD="$CC_FOR_BUILD" diff --git a/packages/mruby/tasks-toolchains-android.rake.patch b/packages/mruby/tasks-toolchains-android.rake.patch index 8bf789b896..d1d648591d 100644 --- a/packages/mruby/tasks-toolchains-android.rake.patch +++ b/packages/mruby/tasks-toolchains-android.rake.patch @@ -1,14 +1,5 @@ --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake -@@ -218,7 +218,7 @@ - end - end - if Integer(@platform.rpartition('-')[2]) < 21 -- case arch -+ case nil - when /arm64-v8a/, /x86_64/, /mips64/ - raise NotImplementedError, "Platform (#{@platform}) has no implementation for architecture (#{arch})" - end @@ -252,7 +252,7 @@ def ar case toolchain @@ -24,9 +15,9 @@ when :clang - case arch + case nil - when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi) - when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi) - when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android) + 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 @@ -36,30 +27,15 @@ 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() -@@ -304,12 +304,12 @@ - flags += %W(-U_WIN32 -U_WIN64) - end - -- flags += %W(-MMD -MP -D__android__ -DANDROID --sysroot="#{sysroot}") -+ flags += %W(-MMD -MP -D__android__ -DANDROID) +@@ -254,7 +254,7 @@ flags += ctarget case toolchain when :gcc - when :clang -- flags += %W(-gcc-toolchain "#{gcc_toolchain_path}" -Wno-invalid-command-line-argument -Wno-unused-command-line-argument) -+ flags += %W(-Wno-invalid-command-line-argument -Wno-unused-command-line-argument) +- 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) - -@@ -319,8 +319,6 @@ - def ldflags - flags = [] - -- flags += %W(--sysroot="#{sysroot}") -- - flags - end - @@ -333,8 +331,7 @@ when /armeabi-v7a/ then flags += %W(-Wl#{no_warn_mismatch}) end @@ -67,6 +43,6 @@ - flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}") - case arch + case nil - when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi -Wl,--fix-cortex-a8#{no_warn_mismatch}) - when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi) - when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android) + 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})