diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/engineering.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch | 43 |
2 files changed, 12 insertions, 35 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index be890d1c190..ffa18f1dcdd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1947,7 +1947,7 @@ bootloader in Espressif ESP8266 & ESP32 series chips.") (define-public radare2 (package (name "radare2") - (version "6.1.0") ;keep in sync with iaito + (version "6.1.2") ;keep in sync with iaito (source (origin (method git-fetch) (uri (git-reference @@ -1955,7 +1955,7 @@ bootloader in Espressif ESP8266 & ESP32 series chips.") (commit version))) (sha256 (base32 - "0949q61l9c5b1f62ilvqs3lh4c98my7wkj43di2x7wrs4rz0qv1q")) + "1d4sslhjxm00fchqcszfa59wf51v632jvf7aj4af0vdhl9f9n8k2")) (file-name (git-file-name name version)) (patches (search-patches "radare2-fix-meson-build-to-use-sys-sdb.patch" diff --git a/gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch b/gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch index 4e862b02d74..54b345b78bb 100644 --- a/gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch +++ b/gnu/packages/patches/radare2-fix-meson-build-to-use-sys-qjs.patch @@ -3,18 +3,23 @@ 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 +index b84a187af7..2d96b8a7cf 100644 --- a/libr/lang/meson.build +++ b/libr/lang/meson.build -@@ -4,13 +4,11 @@ r_lang_sources = [ +@@ -4,9 +4,8 @@ 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_pkgcfg_private_libs = [] + if mth.found() + r_lang_pkgcfg_private_libs += ['-lm'] +@@ -14,7 +13,7 @@ endif + r_lang = library('r_lang', r_lang_sources, - include_directories: [platform_inc, spp_inc, qjs_inc], @@ -22,7 +27,7 @@ index 0742e0e531..a6367cea39 100644 c_args: library_cflags, dependencies: [ r_util_dep, -@@ -21,19 +19,23 @@ r_lang = library('r_lang', r_lang_sources, +@@ -25,15 +24,15 @@ r_lang = library('r_lang', r_lang_sources, r_esil_dep, r_muta_dep, r_cons_dep, @@ -36,35 +41,7 @@ index 0742e0e531..a6367cea39 100644 ) -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], -+) ++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, |