Make makefile builds working

radareorg · Feb 4, 2025 · ee84267 · ee84267
1 parent 4db85a6
commit ee84267
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 18 deletions.
diff --git a/binr/radare2/Makefile b/binr/radare2/Makefile
@@ -82,7 +82,13 @@ macos-sign-libs:
 
 ifeq ($(OSTYPE),android)
 LDFLAGS+=${DL_LIBS} -lm
-LDFLAGS+=../../shlr/capstone/libcapstone.a
+ifeq ($(USE_CSNEXT),1)
+LDFLAGS+=../../subprojects/capstone-next/libcapstone.a
+else ifeq ($(USE_CS4),1)
+LDFLAGS+=../../subprojects/capstone-v4/libcapstone.a
+else
+LDFLAGS+=../../subprojects/capstone-v5/libcapstone.a
+endif
 endif
 
 include ../../libr/socket/deps.mk

diff --git a/binr/rules.mk b/binr/rules.mk
@@ -38,7 +38,7 @@ endif
 ifeq (${COMPILER},wasi)
 LINK+=$(SHLR)/zip/librz.a
 LINK+=$(SHLR)/gdb/lib/libgdbr.a
-LINK+=$(SHLR)/capstone/libcapstone.a
+LINK+=$(CS_ROOT)/libcapstone.a
 LINK+=$(SHLR)/../subprojects/sdb/src/libsdb.a
 
 # instead of libr.a

diff --git a/libr/Makefile b/libr/Makefile
@@ -129,8 +129,12 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
 
 ifeq ($(USE_CAPSTONE),1)
 E+=$(CAPSTONE_LDFLAGS)
+else ifeq ($(USE_CSNEXT),1)
+E+=$(CS_ROOT)/libcapstone.${EXT_AR}
+else ifeq ($(USE_CS4),1)
+E+=$(CS_ROOT)/libcapstone.${EXT_AR}
 else
-E+=../shlr/capstone/libcapstone.${EXT_AR}
+E+=$(CS_ROOT)/libcapstone.${EXT_AR}
 endif
 
 ifeq ($(OSTYPE),darwin)

diff --git a/libr/anal/p/capstone.mk b/libr/anal/p/capstone.mk
@@ -6,8 +6,8 @@ CS_CFLAGS=${CAPSTONE_CFLAGS}
 CS_LDFLAGS=${CAPSTONE_LDFLAGS}
 else
 # use capstone from shlr/capstone
-CS_CFLAGS=-I${SHLR}/capstone/include
-CS_LDFLAGS=$(SHLR)/capstone/libcapstone.a
+CS_CFLAGS=-I$(CS_ROOT)/include
+CS_LDFLAGS=$(CS_ROOT)/libcapstone.a
 #SHARED_OBJ+=${CS_LDFLAGS}
 endif
 

diff --git a/libr/arch/p/capstone.mk b/libr/arch/p/capstone.mk
@@ -1,13 +1,3 @@
-ifeq ($(USE_CSNEXT),1)
-  CS_ROOT=../../subprojects/capstone-next
-else
-ifeq ($(USE_CS4),1)
-  CS_ROOT=../../subprojects/capstone-v4
-else
-  CS_ROOT=../../subprojects/capstone-v5
-endif
-endif
-
 ifeq ($(WANT_CAPSTONE),1)
   ifeq ($(USE_CAPSTONE),1)
     CS_CFLAGS=${CAPSTONE_CFLAGS}

diff --git a/libr/config.mk.tail b/libr/config.mk.tail
@@ -14,6 +14,14 @@ MSVC=$(R2DIR)/msvc
 endif
 endif
 
+ifeq ($(USE_CSNEXT),1)
+CS_ROOT:=$(LIBR)/../subprojects/capstone-next
+else ifeq ($(USE_CS4),1)
+CS_ROOT:=$(LIBR)/../subprojects/capstone-v4
+else
+CS_ROOT:=$(LIBR)/../subprojects/capstone-v5
+endif
+
 SHLR:=$(LIBR)/../shlr
 
 include $(LIBR)/../global.mk

diff --git a/libr/do-ar-sh b/libr/do-ar-sh
@@ -1,6 +1,15 @@
 #!/bin/sh
 
-LIBS="libr/cons/libr_cons.a libr/util/libr_util.a  libr/bin/libr_bin.a  libr/anal/libr_anal.a libr/bp/libr_bp.a libr/crypto/libr_crypto.a libr/debug/libr_debug.a subprojects/sdb/src/libsdb.a libr/core/libr_core.a libr/main/libr_main.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flag/libr_flag.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/capstone/libcapstone.a  shlr/gdb/lib/libgdbr.a"
+LIBS="libr/cons/libr_cons.a libr/util/libr_util.a  libr/bin/libr_bin.a  libr/anal/libr_anal.a libr/bp/libr_bp.a libr/crypto/libr_crypto.a libr/debug/libr_debug.a subprojects/sdb/src/libsdb.a libr/core/libr_core.a libr/main/libr_main.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flag/libr_flag.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/gdb/lib/libgdbr.a"
+
+if [ "${USE_CS4}" = 1 ]; then
+	LIBS="$(LIBS) subprojects/capstone-v4/libcapstone.a"
+elif [ "${USE_CSNEXT}" = 1 ]; then
+	LIBS="$(LIBS) subprojects/capstone-next/libcapstone.a"
+else
+	LIBS="$(LIBS) subprojects/capstone-v5/libcapstone.a"
+fi
+
 cd ..
 
 LIB=libr.a

diff --git a/libr/main/radare2.c b/libr/main/radare2.c
@@ -115,7 +115,7 @@ static int r_main_version_verify(RCore *core, bool show, bool json) {
 			pj_ko (pj, "thirdparty");
 			{
 				pj_ko (pj, "capstone");
-				pj_ks (pj, "destdir", "shlr/capstone");
+				pj_ks (pj, "destdir", "subprojects/capstone-v*");
 				pj_ks (pj, "git", "https://github.com/capstone-engine/capstone");
 				pj_ks (pj, "branch", "v5");
 				pj_ks (pj, "license", "BSD-3-Clause");

diff --git a/shlr/capstone.mk b/shlr/capstone.mk
@@ -2,7 +2,7 @@ ifeq ($(WANT_CAPSTONE),1)
 ifeq ($(USE_CAPSTONE),1)
 LINK+=${CAPSTONE_LDFLAGS}
 else
-LINK+=$(SHLR)/capstone/libcapstone.a
+LINK+=$(CS_ROOT)/libcapstone.a
 endif
 else
 # nothing