Loading ifs/scripts/compile_dep.sh +6 −1 Original line number Diff line number Diff line Loading @@ -207,8 +207,10 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then prepare_build_dir ${CURR} cd ${CURR} # patch hanging issue echo "########## Applying cci hanging patch" echo "########## ADA-FS injection: Applying cci hanging patch" git apply ${PATCH_DIR}/cci_hang_final.patch || exit 1 echo "########## ADA-FS injection: Disabling cci debug mode/devel mode entirely" git apply ${PATCH_DIR}/cci_remove_devel_mode.patch || exit 1 ./autogen.pl || exit 1 cd ${CURR}/build if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then Loading @@ -216,6 +218,9 @@ if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then else ../configure --prefix=${INSTALL} LIBS="-lpthread" || exit 1 fi echo "########## ADA-FS injection: Replacing any remaining CFLAGS with '-g -O2' that are added by cci although debug mode is disabled with '-O3'" find . -type f -exec sed -i 's/-g -O2/-O3/g' {} \; make -j${CORES} || exit 1 make install || exit 1 make check || exit 1 Loading ifs/scripts/patches/cci_remove_devel_mode.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff --git a/config/cci.m4 b/config/cci.m4 index 7afc60c..15ddff1 100644 --- a/config/cci.m4 +++ b/config/cci.m4 @@ -5,18 +5,7 @@ dnl Copyright © 2012 UT-Battelle, LLC. All rights reserved. dnl Copyright © 2012 Oak Ridge National Labs. All rights reserved. dnl -# Define CCI configure command line arguments -AC_DEFUN([CCI_DEFINE_ARGS],[ - AC_ARG_ENABLE([picky], - [AC_HELP_STRING([--enable-picky], - [Turn on maintainer-level compiler pickyness])]) - AS_IF([test -d $srcdir/.hg -o -d $srcdir/.svn -o -d $srcdir/.git], - [CCI_DEVEL_BUILD=yes - AS_IF([test "$enable_picky" = ""], - [AC_MSG_WARN([Developer build: enabling pickyness by default]) - enable_picky=yes])]) -]) - +CCI_DEVEL_BUILD=no # Main CCI m4 macro # # Expects two or three paramters: Loading
ifs/scripts/compile_dep.sh +6 −1 Original line number Diff line number Diff line Loading @@ -207,8 +207,10 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then prepare_build_dir ${CURR} cd ${CURR} # patch hanging issue echo "########## Applying cci hanging patch" echo "########## ADA-FS injection: Applying cci hanging patch" git apply ${PATCH_DIR}/cci_hang_final.patch || exit 1 echo "########## ADA-FS injection: Disabling cci debug mode/devel mode entirely" git apply ${PATCH_DIR}/cci_remove_devel_mode.patch || exit 1 ./autogen.pl || exit 1 cd ${CURR}/build if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then Loading @@ -216,6 +218,9 @@ if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then else ../configure --prefix=${INSTALL} LIBS="-lpthread" || exit 1 fi echo "########## ADA-FS injection: Replacing any remaining CFLAGS with '-g -O2' that are added by cci although debug mode is disabled with '-O3'" find . -type f -exec sed -i 's/-g -O2/-O3/g' {} \; make -j${CORES} || exit 1 make install || exit 1 make check || exit 1 Loading
ifs/scripts/patches/cci_remove_devel_mode.patch 0 → 100644 +24 −0 Original line number Diff line number Diff line diff --git a/config/cci.m4 b/config/cci.m4 index 7afc60c..15ddff1 100644 --- a/config/cci.m4 +++ b/config/cci.m4 @@ -5,18 +5,7 @@ dnl Copyright © 2012 UT-Battelle, LLC. All rights reserved. dnl Copyright © 2012 Oak Ridge National Labs. All rights reserved. dnl -# Define CCI configure command line arguments -AC_DEFUN([CCI_DEFINE_ARGS],[ - AC_ARG_ENABLE([picky], - [AC_HELP_STRING([--enable-picky], - [Turn on maintainer-level compiler pickyness])]) - AS_IF([test -d $srcdir/.hg -o -d $srcdir/.svn -o -d $srcdir/.git], - [CCI_DEVEL_BUILD=yes - AS_IF([test "$enable_picky" = ""], - [AC_MSG_WARN([Developer build: enabling pickyness by default]) - enable_picky=yes])]) -]) - +CCI_DEVEL_BUILD=no # Main CCI m4 macro # # Expects two or three paramters: