From d98c5b908078bccd59005e2f1be4532d940d5079 Mon Sep 17 00:00:00 2001 From: Riccardo Schirone Date: Mon, 30 Jul 2018 08:51:47 +0200 Subject: [PATCH] shlr/meson.build: use master branch for capstone on meson build too (#10832) --- shlr/Makefile | 2 +- shlr/meson.build | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/shlr/Makefile b/shlr/Makefile index b4bc0aa8c9..66cf469d4e 100644 --- a/shlr/Makefile +++ b/shlr/Makefile @@ -24,8 +24,8 @@ else CS_TAR= CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git CS_UPD=20180723 +# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build CS_BRA=master -# NOTE: when you update CS_TIP, also update it in shlr/meson.build CS_TIP=782ea67e17a391ca0d3faafdc365b335a1a8930a # REVERT THIS COMMIT BECAUSE ITS WRONG CS_REV= diff --git a/shlr/meson.build b/shlr/meson.build index a24969d0a9..9267cf558d 100644 --- a/shlr/meson.build +++ b/shlr/meson.build @@ -10,11 +10,14 @@ if not capstone_dep.found() or not get_option('use_sys_capstone') error('Cannot load capstone library. Either provide capstone in ./shlr/capstone or install git, so it can be downloaded') endif - # NOTE: when you update CS_TIP, also update it in shlr/Makefile + # NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile CS_TIP = '782ea67e17a391ca0d3faafdc365b335a1a8930a' + CS_BRA = 'master' - 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) + capstone_git_user = 'aquynh' + + message('Cloning capstone ' + CS_BRA + ' branch, commit ' + CS_TIP + ', into ' + capstone_path) + git_cmd = 'clone -b @0@ https://github.com/@1@/capstone.git @2@'.format(CS_BRA, capstone_git_user, capstone_path) clone_cmd = run_command(git_exe, git_cmd.split()) if clone_cmd.returncode() != 0 error('Cannot execute git clone command')