Muon build fixes ##ci

.github/workflows/tcc.yml

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

Makefile

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

shlr/Makefile

@@ -219,6 +219,11 @@ install-symlink symstall:
 uninstall deinstall:
 	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)
 capstone:
 

shlr/meson.build

@@ -1,6 +1,8 @@
 # handle capstone dependency
 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')
     capstone_path = join_paths(meson.current_build_dir(), 'capstone')
   else
@@ -224,8 +226,6 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
     link_with: libr2capstone,
     include_directories: capstone_includes
   )
-else
-  message('Use system-provided capstone library')
 endif
 
 # handle bochs dependency