DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-01-08 03:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgpkg(main/mruby): 3.3.0

Browse Source 
Signed-off-by: Kevin Williams <admin@utermux.dev>
This commit is contained in:
termux-pacman-bot
2024-02-21 11:09:05 +00:00
parent 1241680e46
commit e48e2ce37c
2 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
packages/mruby/tasks-toolchains-android.rake.patch
View File

@@ -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})