Commit 3e63ed8c authored by Ramon Nou's avatar Ramon Nou
Browse files

update margo/thallium

parent f35451a5

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ scripts: 
    - cd ${BUILD_PATH}/tests/scripts

    - ${BATS} -r ${CI_PROJECT_DIR}/tests/scripts/dl_dep.sh --formatter junit

    - ${BATS} -r ${CI_PROJECT_DIR}/tests/scripts/compile_dep.sh --formatter junit

  rules:

    when: manual

  artifacts:

    expire_in: 1 day

    reports:

scripts/profiles/0.9.6-dev/default.specs

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ wgetdeps=( 
clonedeps=(

    ["libfabric"]="HEAD@v2.2.0"

    ["mercury"]="v2.4.1"

    ["margo"]="v0.21.0"

    ["thallium"]="v0.15.1"

    ["margo"]="v0.23.1"

    ["thallium"]="v0.17.1"

    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"

)

scripts/profiles/0.9.6-dev/install/margo.install

+3 −2
Original line number Diff line number Diff line
@@ -48,9 +48,10 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/${ID}"

    prepare_build_dir "${CURR}"

    cd "${CURR}"

    ./prepare.sh

    # ./prepare.sh

    cd "${CURR}/build"

    ../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"

    cmake .. -DENABLE_TESTS=OFF -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}

    #../configure --prefix="${INSTALL_DIR}" PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CFLAGS="${CFLAGS} -Wall -O3"

    make -j"${CORES}" install

}

scripts/profiles/0.9.6-dev/mn5.specs

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ wgetdeps=( 
# Dependencies that must be cloned.

clonedeps=(

    ["mercury"]="v2.4.1"

    ["margo"]="v0.21.0"

    ["thallium"]="v0.15.1"

    ["margo"]="v0.23.1"

    ["thallium"]="v0.17.1"

    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"

)