From 1c9432c849dc2a281a9f764412590a27df7f548c Mon Sep 17 00:00:00 2001 From: pancake Date: Thu, 9 Sep 2021 11:28:57 -0700 Subject: [PATCH] Remove few plugins from the meson build to make windows happy (#19064) The latest linker seems to add some a symbol in an include file, better disable those plugins for now --- libr/anal/meson.build | 12 ++++++------ libr/asm/meson.build | 26 +++++++++++++------------- libr/meson.build | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libr/anal/meson.build b/libr/anal/meson.build index e294394022..4925f7c844 100644 --- a/libr/anal/meson.build +++ b/libr/anal/meson.build @@ -46,7 +46,7 @@ r_anal_sources = [ 'p/anal_6502_cs.c', 'p/anal_8051.c', 'p/anal_amd29k.c', - 'p/anal_arc.c', + #'p/anal_arc.c', 'p/anal_arm_cs.c', 'p/anal_arm_gnu.c', 'p/anal_avr.c', @@ -96,7 +96,7 @@ r_anal_sources = [ 'p/anal_x86_cs.c', 'p/anal_xap.c', 'p/anal_xcore_cs.c', - 'p/anal_xtensa.c', + #'p/anal_xtensa.c', 'p/anal_z80.c', #'arch/gb/meta_gb_cmt.c', 'arch/hexagon/hexagon_anal.c', @@ -127,10 +127,10 @@ r_anal_sources = [ '../asm/arch/v810/v810_disas.c', '../asm/arch/v850/v850_disas.c', '../asm/arch/wasm/wasm.c', - '../asm/arch/xtensa/gnu/xtensa-dis.c', - '../asm/arch/xtensa/gnu/elf32-xtensa.c', - '../asm/arch/xtensa/gnu/xtensa-isa.c', - '../asm/arch/xtensa/gnu/xtensa-modules.c', + #'../asm/arch/xtensa/gnu/xtensa-dis.c', + #'../asm/arch/xtensa/gnu/elf32-xtensa.c', + #'../asm/arch/xtensa/gnu/xtensa-isa.c', + #'../asm/arch/xtensa/gnu/xtensa-modules.c', '../asm/arch/pyc/opcode_all.c', '../asm/arch/pyc/opcode_anal.c', '../asm/arch/pyc/opcode_arg_fmt.c', diff --git a/libr/asm/meson.build b/libr/asm/meson.build index b2d4bc688e..3b9b6df0db 100644 --- a/libr/asm/meson.build +++ b/libr/asm/meson.build @@ -10,7 +10,7 @@ r_asm_sources = [ 'p/asm_6502_cs.c', 'p/asm_8051.c', 'p/asm_amd29k.c', - 'p/asm_arc.c', +# 'p/asm_arc.c', 'p/asm_arm_as.c', 'p/asm_arm_cs.c', 'p/asm_arm_gnu.c', @@ -28,7 +28,7 @@ r_asm_sources = [ 'p/asm_h8300.c', 'p/asm_hexagon.c', #'p/asm_hexagon_gnu.c', - 'p/asm_hppa_gnu.c', + #'p/asm_hppa_gnu.c', 'p/asm_i4004.c', 'p/asm_i8080.c', 'p/asm_java.c', @@ -76,7 +76,7 @@ r_asm_sources = [ #'p/asm_x86_vm.c', 'p/asm_xap.c', 'p/asm_xcore_cs.c', - 'p/asm_xtensa.c', + # 'p/asm_xtensa.c', 'p/asm_z80.c', #'arch/6502/6502dis.c', 'arch/amd29k/amd29k.c', @@ -84,10 +84,10 @@ r_asm_sources = [ 'arch/8051/8051_ass.c', 'arch/v850/gnu/v850-dis.c', 'arch/v850/gnu/v850-opc.c', - 'arch/arc/gnu/arc-dis.c', - 'arch/arc/gnu/arc-ext.c', - 'arch/arc/gnu/arc-opc.c', - 'arch/arc/gnu/arcompact-dis.c', + #'arch/arc/gnu/arc-dis.c', + #'arch/arc/gnu/arc-ext.c', + #'arch/arc/gnu/arc-opc.c', + #'arch/arc/gnu/arcompact-dis.c', 'arch/arm/aarch64/aarch64-dis-2.c', 'arch/arm/aarch64/aarch64-dis.c', 'arch/arm/aarch64/aarch64-opc-2.c', @@ -115,7 +115,7 @@ r_asm_sources = [ #'arch/hexagon/gnu/hexagon-dis.c', #'arch/hexagon/gnu/hexagon-opc.c', #'arch/hexagon/gnu/safe-ctype.c', - 'arch/hppa/gnu/hppa-dis.c', + #'arch/hppa/gnu/hppa-dis.c', #'arch/i4004/i4004dis.c', #'arch/i8080/i8080dis.c', 'arch/lanai/gnu/lanai-dis.c', @@ -170,11 +170,11 @@ r_asm_sources = [ 'arch/vax/vax-dis.c', 'arch/wasm/wasm.c', 'arch/whitespace/wsdis.c', - #'arch/xap/dis.c', - 'arch/xtensa/gnu/elf32-xtensa.c', - 'arch/xtensa/gnu/xtensa-dis.c', - 'arch/xtensa/gnu/xtensa-isa.c', - 'arch/xtensa/gnu/xtensa-modules.c', + # 'arch/xap/dis.c', + # 'arch/xtensa/gnu/elf32-xtensa.c', + # 'arch/xtensa/gnu/xtensa-dis.c', + # 'arch/xtensa/gnu/xtensa-isa.c', + # 'arch/xtensa/gnu/xtensa-modules.c', #'arch/z80/expressions.c', 'arch/z80/z80.c', #'arch/z80/z80asm.c', diff --git a/libr/meson.build b/libr/meson.build index 4f9307da44..c5ae524201 100644 --- a/libr/meson.build +++ b/libr/meson.build @@ -129,7 +129,7 @@ anal_plugins += [ '6502', '8051', 'amd29k', - 'arc', + #'arc', 'arm_cs', 'avr', 'bf', @@ -172,14 +172,14 @@ anal_plugins += [ 'x86_cs', 'xap', 'xcore_cs', - 'xtensa', +# 'xtensa', ] asm_plugins += [ '6502', '8051', 'amd29k', - 'arc', +# 'arc', 'arm_as', 'arm_cs', 'arm_winedbg', @@ -231,7 +231,7 @@ asm_plugins += [ 'x86_nz', 'xap', 'xcore_cs', - 'xtensa', +# 'xtensa', ] if no_user_plugins @@ -240,7 +240,7 @@ if no_user_plugins 'z80', 'arm_gnu', 'cris_gnu', - 'hppa_gnu', + # 'hppa_gnu', 'm68k_gnu', 'lanai_gnu', 'mips_gnu',