From 7c57b92daedd34df34b47c4b9ee2dc62b2313744 Mon Sep 17 00:00:00 2001
From: Dhruv Maroo <dhruvmaru007@gmail.com>
Date: Wed, 4 Sep 2024 03:18:21 +0200
Subject: [PATCH] Add wrap for native SoftFloat subproject

---
 .gitignore                              | 2 +-
 librz/util/meson.build                  | 2 +-
 meson.build                             | 6 +++---
 subprojects/pcre2_cross_native.wrap     | 1 +
 subprojects/softfloat.wrap              | 5 ++++-
 subprojects/softfloat_cross_native.wrap | 5 +++++
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 subprojects/softfloat_cross_native.wrap

diff --git a/.gitignore b/.gitignore
index 1f44b3410a..2dc058cf44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,7 @@ subprojects/libmspack/
 subprojects/blake3/
 subprojects/xz-*/
 subprojects/zstd-*/
-subprojects/softfloat/
+subprojects/softflo*/
 dist/windows/Output
 # Core files generated by OpenBSD
 *.core
diff --git a/librz/util/meson.build b/librz/util/meson.build
index e0443bccb4..de2771c356 100644
--- a/librz/util/meson.build
+++ b/librz/util/meson.build
@@ -151,7 +151,7 @@ if meson.is_cross_build()
       cc_native.find_library('psapi'),
     ]
   endif
-  rz_util_native_deps = [ldl_native, lrt_native, mth_native, th_native, utl_native, pcre2_native_dep, softfloat_native_dep] + platform_native_deps
+  rz_util_native_deps = [ldl_native, lrt_native, mth_native, th_native, utl_native, pcre2_native_dep, softfloat_cross_native_dep] + platform_native_deps
   if execinfo_native.found()
     rz_util_native_deps += [execinfo_native]
   endif
diff --git a/meson.build b/meson.build
index 5609219e52..72e2b097f9 100644
--- a/meson.build
+++ b/meson.build
@@ -616,13 +616,13 @@ endif
 
 softfloat_dep = dependency('softfloat', required: get_option('use_sys_softfloat'), static: is_static_build)
 if not softfloat_dep.found()
-  softfloat_proj = subproject('softfloat', default_options: ['default_library=static', 'warning_level=0'])
+  softfloat_proj = subproject('softfloat', default_options: ['default_library=static'])
   softfloat_dep = softfloat_proj.get_variable('softfloat_dep')
 endif
 
 if meson.is_cross_build()
-  softfloat_proj = subproject('softfloat', default_options: ['default_library=static', 'warning_level=0'])
-  softfloat_native_dep = softfloat_proj.get_variable('softfloat_dep')
+  softfloat_cross_native_proj = subproject('softfloat_cross_native', default_options: ['default_library=static', 'cross_native=true'])
+  softfloat_cross_native_dep = softfloat_cross_native_proj.get_variable('softfloat_dep')
 endif
 
 # handle zip dependency
diff --git a/subprojects/pcre2_cross_native.wrap b/subprojects/pcre2_cross_native.wrap
index b4c49c264c..f4e3f3eb44 100644
--- a/subprojects/pcre2_cross_native.wrap
+++ b/subprojects/pcre2_cross_native.wrap
@@ -3,6 +3,7 @@ url = https://github.com/PCRE2Project/pcre2.git
 revision = 6ae58beca071f13ccfed31d03b3f479ab520639b
 directory = pcre2_cross_native
 patch_directory = pcre2_cross_native
+depth = 1
 
 [provide]
 dependency_names = pcre2_cross_native
diff --git a/subprojects/softfloat.wrap b/subprojects/softfloat.wrap
index a41cb5507b..15b4f77890 100644
--- a/subprojects/softfloat.wrap
+++ b/subprojects/softfloat.wrap
@@ -1,5 +1,8 @@
 [wrap-git]
 url = https://github.com/rizinorg/softfloat
-revision = e06f4fcbdc6b3545c0624ac70725daf95eda53e8
+revision = 537d18e71a51aea70f6b54334854f7014c6458c7
 directory = softfloat
 depth = 1
+
+[provide]
+softfloat=softfloat_dep
diff --git a/subprojects/softfloat_cross_native.wrap b/subprojects/softfloat_cross_native.wrap
new file mode 100644
index 0000000000..f8f94300e4
--- /dev/null
+++ b/subprojects/softfloat_cross_native.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+url = https://github.com/rizinorg/softfloat
+revision = 537d18e71a51aea70f6b54334854f7014c6458c7
+directory = softfloat_cross_native
+depth = 1