capstone: use master branch since v4 has been merged there now

This commit is contained in:
Riccardo Schirone 2018-07-23 18:05:30 +02:00 committed by Anton Kochkov
parent 1d4577db80
commit 97b20da54f
3 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@ Capstone
Capstone Engine is the disassembler engine used by radare2 by default for
some architectures.
Radare2 ships its own version of capstone based on the -next branch with
Radare2 ships its own version of capstone based on the -master branch with
some minor patches. The problem is that latest release have some compile
time dependencies that make compilation with older releases a bit harder.

View File

@ -16,17 +16,17 @@ GIT?=git
WGET?=wget
ifeq ($(CS_RELEASE),1)
CS_VER=3.0.4
CS_VER=3.0.5
CS_TAR=https://codeload.github.com/aquynh/capstone/tar.gz/$(CS_VER)
#CS_TAR=http://capstone-engine.org/download/$(CS_VER)/capstone-$(CS_VER).tgz
CS_PATCHES=0
else
CS_TAR=
CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
CS_UPD=20180715
CS_BRA=next
CS_UPD=20180723
CS_BRA=master
# NOTE: when you update CS_TIP, also update it in shlr/meson.build
CS_TIP=d03cab449dee0c882912e836d19da9a432c89cc2
CS_TIP=443f82ee74f8e0308d53f5833414c07cd866219f
# REVERT THIS COMMIT BECAUSE ITS WRONG
CS_REV=
CS_PATCHES=1

View File

@ -11,7 +11,7 @@ if not capstone_dep.found() or not get_option('use_sys_capstone')
endif
# NOTE: when you update CS_TIP, also update it in shlr/Makefile
CS_TIP = 'd03cab449dee0c882912e836d19da9a432c89cc2'
CS_TIP = '443f82ee74f8e0308d53f5833414c07cd866219f'
message('Cloning capstone next branch, commit ' + CS_TIP + ', into ' + capstone_path)
git_cmd = 'clone -b next https://github.com/aquynh/capstone.git @0@'.format(capstone_path)