portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add wrap for native SoftFloat subproject

Browse source
This commit is contained in:
Dhruv Maroo 2024-09-04 03:18:21 +02:00 committed by Anton Kochkov
parent 2d5a70879b
commit 7c57b92dae
6 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -131,7 +131,7 @@ subprojects/libmspack/
subprojects/blake3/ subprojects/blake3/
subprojects/xz-*/ subprojects/xz-*/
subprojects/zstd-*/ subprojects/zstd-*/
subprojects/softfloat/ subprojects/softflo*/
dist/windows/Output dist/windows/Output
# Core files generated by OpenBSD # Core files generated by OpenBSD
*.core *.core

2
librz/util/meson.build
View file

@ -151,7 +151,7 @@ if meson.is_cross_build()
cc_native.find_library('psapi'), cc_native.find_library('psapi'),
] ]
endif 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() if execinfo_native.found()
rz_util_native_deps += [execinfo_native] rz_util_native_deps += [execinfo_native]
endif endif

6
meson.build
View file

@ -616,13 +616,13 @@ endif
softfloat_dep = dependency('softfloat', required: get_option('use_sys_softfloat'), static: is_static_build) softfloat_dep = dependency('softfloat', required: get_option('use_sys_softfloat'), static: is_static_build)
if not softfloat_dep.found() 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') softfloat_dep = softfloat_proj.get_variable('softfloat_dep')
endif endif
if meson.is_cross_build() if meson.is_cross_build()
softfloat_proj = subproject('softfloat', default_options: ['default_library=static', 'warning_level=0']) softfloat_cross_native_proj = subproject('softfloat_cross_native', default_options: ['default_library=static', 'cross_native=true'])
softfloat_native_dep = softfloat_proj.get_variable('softfloat_dep') softfloat_cross_native_dep = softfloat_cross_native_proj.get_variable('softfloat_dep')
endif endif
# handle zip dependency # handle zip dependency

1
subprojects/pcre2_cross_native.wrap
View file

@ -3,6 +3,7 @@ url = https://github.com/PCRE2Project/pcre2.git
revision = 6ae58beca071f13ccfed31d03b3f479ab520639b revision = 6ae58beca071f13ccfed31d03b3f479ab520639b
directory = pcre2_cross_native directory = pcre2_cross_native
patch_directory = pcre2_cross_native patch_directory = pcre2_cross_native
depth = 1
[provide] [provide]
dependency_names = pcre2_cross_native dependency_names = pcre2_cross_native

5
subprojects/softfloat.wrap
View file

@ -1,5 +1,8 @@
[wrap-git] [wrap-git]
url = https://github.com/rizinorg/softfloat url = https://github.com/rizinorg/softfloat
revision = e06f4fcbdc6b3545c0624ac70725daf95eda53e8 revision = 537d18e71a51aea70f6b54334854f7014c6458c7
directory = softfloat directory = softfloat
depth = 1 depth = 1
[provide]
softfloat=softfloat_dep

5
subprojects/softfloat_cross_native.wrap Normal file
View file

@ -0,0 +1,5 @@
[wrap-git]
url = https://github.com/rizinorg/softfloat
revision = 537d18e71a51aea70f6b54334854f7014c6458c7
directory = softfloat_cross_native
depth = 1