From dd57c4fba2f8724fc6e373e00d496e25f10d3c8c Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 24 Mar 2015 16:35:34 -0700 Subject: [PATCH] build: use CEPH_EXTRA_CONFIGURE_ARGS for flags from build-auto.sh This was the intent, but it was not being used for many of the build scripts. Factor out the flags that build-auto.sh sets (tcmalloc and coverage) into defaults in build-ceph*.sh in case any of them are being run directly, and not via build-auto.sh. Signed-off-by: Josh Durgin --- build-auto.sh | 2 ++ build-ceph-deb-native.sh | 3 ++- build-ceph-deb.sh | 3 ++- build-ceph-gcov.sh | 3 ++- build-ceph-notcmalloc.sh | 3 ++- build-ceph-rpm.sh | 4 +++- build-ceph.sh | 3 ++- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/build-auto.sh b/build-auto.sh index 7666066..2813d5f 100755 --- a/build-auto.sh +++ b/build-auto.sh @@ -12,6 +12,8 @@ fi if hostname | grep -q -- -notcmalloc ; then echo "hostname has -notcmalloc, will build --without-tcmalloc --without-cryptopp" export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --without-tcmalloc" +else + export CEPH_EXTRA_CONFIGURE_ARGS="$CEPH_EXTRA_CONFIGURE_ARGS --with-tcmalloc" fi if hostname | grep -q -- -gcov ; then echo "hostname has -gcov, will --enable-coverage" diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh index 6db619f..7eadeea 100755 --- a/build-ceph-deb-native.sh +++ b/build-ceph-deb-native.sh @@ -25,7 +25,8 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g -O2" ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java || exit 2 +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g -O2" ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh index 1ee3a07..732739f 100755 --- a/build-ceph-deb.sh +++ b/build-ceph-deb.sh @@ -26,7 +26,8 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java || exit 2 +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh index 596c8a0..9019af0 100755 --- a/build-ceph-gcov.sh +++ b/build-ceph-gcov.sh @@ -24,7 +24,8 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || ./configure --enable-coverage --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java || exit 2 +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --enable-coverage" +[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh index 08762dc..2f8f7c2 100755 --- a/build-ceph-notcmalloc.sh +++ b/build-ceph-notcmalloc.sh @@ -25,7 +25,8 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --without-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler || exit 2 +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--without-tcmalloc +[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh index 9475aae..5b16734 100755 --- a/build-ceph-rpm.sh +++ b/build-ceph-rpm.sh @@ -50,7 +50,9 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-nss || exit 2 + +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-nss $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 diff --git a/build-ceph.sh b/build-ceph.sh index b8c27a0..49fac15 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -23,7 +23,8 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-hadoop --with-profiler --enable-cephfs-java --with-librocksdb-static=check || exit 2 +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-hadoop --with-profiler --enable-cephfs-java --with-librocksdb-static=check $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then echo "$0: no Makefile, aborting." 1>&2 -- 2.39.5