Jathenst/328 update capstone to 5 0 0

Ramon Nourequested to merge
jathenst/328-update-capstone-to-5-0-0 into master

Merge request reports

docker/0.9.4/core/Dockerfile

+1 −1
Changes for docker/0.9.4/core/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ RUN apt-get update && \ 
		# RocksDB dependencies

		liblz4-dev \

		# syscall_intercept dependencies

		libcapstone-dev \

		# libcapstone-dev \

		# GekkoFS dependencies

		libboost-program-options-dev \

		uuid-dev ccache && \

docker/build_env.docker

+4 −4
Changes for docker/build_env.docker: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ RUN yum -y -q update && yum -y -q install \ 
	devtoolset-8-gcc-c++ \

	libuuid-devel \

	# syscall_intercept

	capstone \

	capstone-devel \

	# capstone \

	# capstone-devel \

&& yum -y -q clean all



# Enable gcc/g++ 8.x
@@ -100,8 +100,8 @@ RUN yum -y -q update && yum -y -q install \ 
	devtoolset-8-gcc-c++ \

	libuuid-devel \

	# syscall_intercept

	capstone \

	capstone-devel \

	# capstone \

	# capstone-devel \

&& yum -y -q clean all

scripts/profiles/0.9.4/install/capstone.install

+1 −1
Changes for scripts/profiles/0.9.4/install/capstone.install: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/${ID}"

    prepare_build_dir "${CURR}"

    cd "${CURR}/build"

    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release ..

    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS=ON ..

    make -j"${CORES}" install

}

scripts/profiles/0.9.4/install/syscall_intercept.install

+1 −0
Changes for scripts/profiles/0.9.4/install/syscall_intercept.install: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/${ID}"

    EXTRA_INSTALL_ARGS="${PROFILE_EXTRA_INSTALL_ARGS[${ID}]}"

    prepare_build_dir "${CURR}"



    if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then

        cd "${CURR}"/arch/aarch64/

        mkdir -p build

scripts/profiles/0.9.4/agios.specs

+2 −7
Changes for scripts/profiles/0.9.4/agios.specs: 2 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ comment="All dependencies (except transport-specific and experimental)" 
# Dependencies that must be downloaded directly

wgetdeps=(

    ["lz4"]="1.9.4"

    ["capstone"]="4.0.2"

    ["capstone"]="6.0.0-Alpha1"

    ["argobots"]="1.2"

    ["rocksdb"]="8.10.0"

    ["json-c"]="0.17-20230812"
@@ -49,7 +49,7 @@ clonedeps=( 
    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.0"

    ["margo"]="v0.18.3"

    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"

    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"

    ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"

)
@@ -58,11 +58,6 @@ clonedeps_args=( 
    ["mercury"]="--recurse-submodules"

)



# Patches that should be applied post-clone

clonedeps_patches=(

    ["syscall_intercept"]="syscall_intercept.patch"

)



# Ordering that MUST be followed when downloading

order=(

    "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "agios"