Verified Commit c09aebf1 authored by Marc Vef's avatar Marc Vef
Browse files

json-c deps fix (or not ;))

parent 7827cbb3

scripts/compile_dep.sh

+2 −2
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"

)
@@ -507,7 +507,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

+2 −2
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[@]}")