Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 13:19:54 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Muon build fixes ##ci

Browse Source
This commit is contained in:
pancake 2024-08-06 17:54:44 +02:00 committed by pancake
parent 6057b59693
commit 6c8e04ab1f
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/tcc.yml vendored
View File

@ -171,8 +171,8 @@ jobs:
run: r2pm -i samurai run: r2pm -i samurai
- name: Install muon - name: Install muon
run: r2pm -i muon run: r2pm -i muon
- name: Install muon (native) # - name: Install muon (native)
run: r2pm -i muon # run: r2pm -i muon
- name: Building r2 with muon+samu - name: Building r2 with muon+samu
run: | run: |
r2pm -r muon setup b r2pm -r muon setup b

4
Makefile
View File

@ -374,10 +374,6 @@ menu nconfig:
./sys/menu.sh || true ./sys/menu.sh || true
include mk/meson.mk include mk/meson.mk
shlr/capstone:
$(MAKE) -C shlr capstone
include ${MKPLUGINS} include ${MKPLUGINS}
.PHONY: all clean install symstall uninstall deinstall strip .PHONY: all clean install symstall uninstall deinstall strip

5
shlr/Makefile
View File

@ -219,6 +219,11 @@ install-symlink symstall:
uninstall deinstall: uninstall deinstall:
rm -f ${DESTDIR}${LIBDIR}/libr_shlr.${EXT_AR} rm -f ${DESTDIR}${LIBDIR}/libr_shlr.${EXT_AR}
.PHONY: capstone capstone-sync capstone-build capstone-clean capstone-patch capstone-pull
capstone-pull:
$(MAKE) CS_RELEASE=1 WITHOUT_PULL=0 USE_CAPSTONE=0 WANT_CAPSTONE=1 capstone
ifeq ($(WANT_CAPSTONE),0) ifeq ($(WANT_CAPSTONE),0)
capstone: capstone:

6
shlr/meson.build
View File

@ -1,6 +1,8 @@
# handle capstone dependency # handle capstone dependency
capstone_dep = dependency('capstone', version: '>=3.0.4', required: false) capstone_dep = dependency('capstone', version: '>=3.0.4', required: false)
if not capstone_dep.found() or not get_option('use_sys_capstone') if capstone_dep.found() and get_option('use_sys_capstone')
message('Use system-provided capstone library')
else
if get_option('capstone_in_builddir') if get_option('capstone_in_builddir')
capstone_path = join_paths(meson.current_build_dir(), 'capstone') capstone_path = join_paths(meson.current_build_dir(), 'capstone')
else else
@ -224,8 +226,6 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
link_with: libr2capstone, link_with: libr2capstone,
include_directories: capstone_includes include_directories: capstone_includes
) )
else
message('Use system-provided capstone library')
endif endif
# handle bochs dependency # handle bochs dependency