mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
6e612616f0
Includes fixes for CVE-2025-1744, CVE-2025-1864, CVE-2025-60358, CVE-2025-60359, CVE-2025-60360, CVE-2025-60361, CVE-2025-63744, CVE-2025-63745, CVE-2024-26475, CVE-2024-11858, CVE-2023-0302, CVE-2023-1605, CVE-2023-4322, CVE-2023-5686, CVE-2023-46569, CVE-2023-46570, CVE-2023-47016, CVE-2022-0173, CVE-2022-0419, CVE-2022-0139, CVE-2022-0518, CVE-2022-0519, CVE-2022-0520, CVE-2022-0521, CVE-2022-0522, CVE-2022-0523, CVE-2022-0559, CVE-2022-0676, CVE-2022-0712, CVE-2022-0713, CVE-2022-0476, CVE-2022-0695, CVE-2022-0849, CVE-2022-1031, CVE-2022-1061, CVE-2022-1052, CVE-2022-1207, CVE-2022-1244, CVE-2022-1237, CVE-2022-1238, CVE-2022-1240, CVE-2022-1283, CVE-2022-1284, CVE-2022-1296, CVE-2022-1297, CVE-2022-1382, CVE-2022-1383, CVE-2022-1437, CVE-2022-1444, CVE-2022-1451, CVE-2022-1452, CVE-2022-1649, CVE-2022-1714, CVE-2022-1809, CVE-2022-1899, CVE-2022-4398, CVE-2022-4843. * gnu/packages/engineering.scm (radare2): Update to 6.0.7. [build-system]: Switch to meson-build-system. [arguments]: <#:tests>: enable tests; <#:phases>: remove 'mklibdir, add 'fix-relative-include, add 'skip-tests. [inputs]: Add gmp, libzip, lz4, quickjs-ng, sdb, zlib; remove zip. [native-inputs]: Add node, perl, python-minimal-wrapper. * gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch: New file. * gnu/packages/patches/radare2-fix-meson-build-to-use-sys-sdb.patch: New file. * gnu/local.mk: (dist_patch_DATA): Register new patch files. Change-Id: I646f67279d238c3d447b3dca97d78b5768989a14 Signed-off-by: Cayetano Santos <csantosb@inventati.org>
70 lines
2 KiB
Diff
70 lines
2 KiB
Diff
Use guix-provided qjs instead of a meson subproject.
|
|
|
|
Patch by bdunahu <bdunahu@operationnull.com>.
|
|
|
|
diff --git a/libr/lang/meson.build b/libr/lang/meson.build
|
|
index 0742e0e531..a6367cea39 100644
|
|
--- a/libr/lang/meson.build
|
|
+++ b/libr/lang/meson.build
|
|
@@ -4,13 +4,11 @@ r_lang_sources = [
|
|
|
|
spp_inc = [platform_inc, include_directories('../../shlr/spp')]
|
|
|
|
-qjs = subproject('qjs')
|
|
-qjs_inc = qjs.get_variable('incs')
|
|
-qjs_static = qjs.get_variable('qjs_static')
|
|
|
|
+qjs_dep = cc.find_library('qjs', required: true)
|
|
|
|
r_lang = library('r_lang', r_lang_sources,
|
|
- include_directories: [platform_inc, spp_inc, qjs_inc],
|
|
+ include_directories: [platform_inc, spp_inc],
|
|
c_args: library_cflags,
|
|
dependencies: [
|
|
r_util_dep,
|
|
@@ -21,19 +19,23 @@ r_lang = library('r_lang', r_lang_sources,
|
|
r_esil_dep,
|
|
r_muta_dep,
|
|
r_cons_dep,
|
|
+ qjs_dep,
|
|
],
|
|
- link_with: qjs_static,
|
|
install: true,
|
|
implicit_include_directories: false,
|
|
install_rpath: rpath_lib,
|
|
soversion: r2_libversion
|
|
)
|
|
|
|
-r_lang_dep = declare_dependency(link_with: r_lang, include_directories: [platform_inc, qjs_inc])
|
|
+r_lang_dep = declare_dependency(
|
|
+ link_with: r_lang,
|
|
+ include_directories: [platform_inc],
|
|
+ dependencies: [qjs_dep],
|
|
+)
|
|
|
|
if get_option('blob')
|
|
r_lang_static = static_library('r_lang_static', r_lang_sources,
|
|
- include_directories: [platform_inc, spp_inc, qjs_inc],
|
|
+ # include_directories: [platform_inc, spp_inc qjs_inc], # unused
|
|
c_args: library_cflags,
|
|
dependencies: [
|
|
r_util_static_dep,
|
|
@@ -43,13 +45,15 @@ r_lang_static = static_library('r_lang_static', r_lang_sources,
|
|
r_muta_static_dep,
|
|
r_cons_static_dep,
|
|
],
|
|
- link_with: qjs_static,
|
|
+ # link_with: qjs_static, # unused
|
|
install: true,
|
|
implicit_include_directories: false,
|
|
)
|
|
|
|
-r_lang_static_dep = declare_dependency(link_with: r_lang_static,
|
|
- include_directories: [platform_inc, qjs_inc])
|
|
+r_lang_static_dep = declare_dependency(
|
|
+ link_with: r_lang_static,
|
|
+ # include_directories: [platform_inc, qjs_inc] # unused
|
|
+ )
|
|
endif
|
|
|
|
pkgconfig_mod.generate(r_lang,
|