Commit f845cd8d authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'cflags' into 'master' 

Do not override CFLAGS while compiling dependencies

See merge request zdvresearch_bsc/adafs!137
parents a1687783 0855a539

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ stages: 
variables:

  DEPS_SRC_PATH:     "${CI_PROJECT_DIR}/deps/src"

  DEPS_INSTALL_PATH: "${CI_PROJECT_DIR}/deps/build"

  DEPS_COMMIT:       "${CI_PROJECT_DIR}/deps/build/gks_deps_commit"

  DEPS_COMMIT:       "${CI_PROJECT_DIR}/deps/build/gkfs_deps_commit"

  BUILD_PATH:        "${CI_PROJECT_DIR}/build"

  TESTS_BUILD_PATH:  "${CI_PROJECT_DIR}/test/build"

  LOG_PATH:          "${CI_PROJECT_DIR}/logs"

scripts/compile_dep.sh

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ if [ "$NA_LAYER" == "bmi" ] || [ "$NA_LAYER" == "all" ]; then 
    cd ${CURR}

    ./prepare

    cd ${CURR}/build

    CFLAGS=-w ../configure --prefix=${INSTALL} --enable-shared --disable-static --disable-karma --enable-bmi-only --enable-fast --disable-strict

    CFLAGS="${CFLAGS} -w" ../configure --prefix=${INSTALL} --enable-shared --disable-static --disable-karma --enable-bmi-only --enable-fast --disable-strict

    make -j${CORES}

    make install

fi
@@ -291,7 +291,7 @@ prepare_build_dir ${CURR} 
cd ${CURR}

./prepare.sh

cd ${CURR}/build

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

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

make -j${CORES}

make install

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