Make r2 pull correct cs5 branch

radareorg · Feb 1, 2025 · 8b4d038 · 8b4d038
1 parent ebcb871
commit 8b4d038
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/libr/arch/p/capstone.mk b/libr/arch/p/capstone.mk
@@ -1,10 +1,10 @@
 ifeq ($(USE_CSNEXT),1)
-  CS_ROOT=../../../subprojects/capstone-next
+  CS_ROOT=../../subprojects/capstone-next
 else
 ifeq ($(USE_CS4),1)
-  CS_ROOT=../../../subprojects/capstone-v4
+  CS_ROOT=../../subprojects/capstone-v4
 else
-  CS_ROOT=../../../subprojects/capstone-v5
+  CS_ROOT=../../subprojects/capstone-v5
 endif
 endif
 
@@ -13,8 +13,12 @@ ifeq ($(WANT_CAPSTONE),1)
     CS_CFLAGS=${CAPSTONE_CFLAGS}
     CS_LDFLAGS=${CAPSTONE_LDFLAGS}
   else
+    #CS_CFLAGS=-I../../shlr/capstone/include
     CS_CFLAGS=-I$(CS_ROOT)/include
-    CS_CFLAGS+=-I$(CS_ROOT)/include/capstone
+    #CS_CFLAGS+=-I../$(CS_ROOT)/include
+    #CS_CFLAGS+=-I../../shlr/capstone/include/capstone
+    #CS_CFLAGS+=-I$(CS_ROOT)/include/capstone
+    #CS_CFLAGS+=-I$(CS_ROOT)/include/capstone
     CS_LDFLAGS=$(CS_ROOT)/libcapstone.a
   endif
 

diff --git a/subprojects/capstone-v5.mk b/subprojects/capstone-v5.mk
@@ -12,7 +12,7 @@ capstone-v5_all: capstone-v5
 capstone-v5:
 	git clone --no-checkout --depth=1 https://github.com/capstone-engine/capstone.git capstone-v5
 	cd capstone-v5 && git fetch --depth=1 origin 8455b3c5a53b02e524494c7e72a3946a32518170
-	cd capstone-v5 && git checkout
+	cd capstone-v5 && git checkout FETCH_HEAD
 	cp -f packagefiles/capstone-v5/* capstone-v5
 
 capstone-v5_clean: