Commit 50bb37b0 authored by Frederic Schimmelpfennig's avatar Frederic Schimmelpfennig
Browse files

json-c deps fix

parent cf858601

scripts/compile_dep.sh

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ DEP_CONFIG="" 
VALID_DEP_OPTIONS="mogongpu mogon2 mogon1 ngio direct all ci"



MOGONGPU_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "mercury" "argobots" "margo" "rocksdb"

    "zstd" "lz4" "snappy" "capstone" "mercury" "argobots" "json-c" "margo" "rocksdb"

    "syscall_intercept" "date" "verbs"

)
@@ -392,8 +392,9 @@ if check_dependency "json-c" "${DEP_CONFIG[@]}"; then 
    CURR=${SOURCE}/json-c

    prepare_build_dir ${CURR}

    cd ${CURR}/build

    ../configure --prefix=${INSTALL}

    ../cmake-configure --prefix=${INSTALL}

    make -j${CORES} install

    mv ${INSTALL}/lib64/pkgconfig/json-c.pc ${INSTALL}/lib/pkgconfig/json-c.pc 

fi



# build BMI
@@ -507,7 +508,7 @@ if check_dependency "margo" "${DEP_CONFIG[@]}"; then 
    cd "${CURR}"

    ./prepare.sh

    cd "${CURR}"/build

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

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

    make -j"${CORES}"

    make install

    [ "${PERFORM_TEST}" ] && make check

scripts/dl_dep.sh

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ VERBOSE=false 
VALID_DEP_OPTIONS="mogongpu mogon2 mogon1 ngio direct all ci"



MOGONGPU_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "mercury" "argobots" "margo" "rocksdb"

    "bzip2" "zstd" "lz4" "snappy" "capstone" "mercury-experimental" "argobots" "json-c" "margo" "rocksdb-experimental"

    "syscall_intercept" "date"

)
@@ -316,7 +316,7 @@ fi 
case ${TMP_DEP_CONF} in

mogongpu)

    DEP_CONFIG=("${MOGONGPU_DEPS[@]}")

    [[ -z "${DEPENDENCY}" ]] && echo "'Mogon1' dependencies are downloaded"

    [[ -z "${DEPENDENCY}" ]] && echo "'Mogon GPU' dependencies are downloaded"

    ;;

mogon1)

    DEP_CONFIG=("${MOGON1_DEPS[@]}")
@@ -420,7 +420,7 @@ fi 
if check_dependency "mercury-experimental" "${DEP_CONFIG[@]}"; then

    # currently not compatible with Hermes

    clonedeps "mercury" "https://github.com/mercury-hpc/mercury" "71672b0d453dc5a64d20f46b86f25fed12566eff" "--recurse-submodules" &

elif check_dependency "rocksdb" "${DEP_CONFIG[@]}"; then

elif check_dependency "mercury" "${DEP_CONFIG[@]}"; then

    clonedeps "mercury" "https://github.com/mercury-hpc/mercury" "4796aeeb90ba58be8a3b17a73f27aa3afed1ee0f" "--recurse-submodules" &

fi