From eccdc8f61273e97710203eaae55a2c4258b64087 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Jun 2016 13:28:28 -0400 Subject: [PATCH] build-ceph-deb-native: don't autogen if make-dist is present The latest ceph-build/build_snapshot_native.sh doesn't need it. Signed-off-by: Sage Weil --- build-ceph-deb-native.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh index a4c12c0..67baaa6 100755 --- a/build-ceph-deb-native.sh +++ b/build-ceph-deb-native.sh @@ -17,22 +17,28 @@ rm -rf .git/modules/ git clean -fdx && git reset --hard /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx DIST=`lsb_release -sc` echo --START-IGNORE-WARNINGS [ ! -x install-deps.sh ] || ./install-deps.sh -[ ! -x autogen.sh ] || ./autogen.sh || exit 1 -autoconf || true -echo --STOP-IGNORE-WARNINGS -[ -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 - exit 3 + +# we only need to use autogen here if we need a dist tarball +if [ ! -x make-dist ]; then + [ ! -x autogen.sh ] || ./autogen.sh || exit 1 + autoconf || true + echo --STOP-IGNORE-WARNINGS + [ -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 + exit 3 + fi +else + echo --STOP-IGNORE-WARNINGS fi # Actually build the project -- 2.39.5