From ea708e749bfe151f9e28b80b80ae3be1fdb0f55d Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Wed, 12 Oct 2016 11:06:00 +0200 Subject: [PATCH 1/2] do_freebsd.sh: Set options for debug building. And that requires that the options need to be passed on completely to the cmake program as well. Thus adding """'s around the option argument with do_cmake.sh as well Signed-off-by: Willem Jan Withagen --- do_cmake.sh | 2 +- do_freebsd.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/do_cmake.sh b/do_cmake.sh index 71340376695..b5ac28513e8 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -6,7 +6,7 @@ if test -e build; then fi mkdir build cd build -cmake $@ .. +cmake "$@" .. # minimal config to find plugins cat < ceph.conf diff --git a/do_freebsd.sh b/do_freebsd.sh index 56c1dc2b114..f9e3029cd15 100755 --- a/do_freebsd.sh +++ b/do_freebsd.sh @@ -13,6 +13,7 @@ fi rm -rf build && ./do_cmake.sh "$*" \ -D CMAKE_BUILD_TYPE=Debug \ -D CMAKE_CXX_FLAGS_DEBUG="-O0 -g" \ + -D CMAKE_C_FLAGS_DEBUG="-O0 -g" \ -D ENABLE_GIT_VERSION=OFF \ -D WITH_BLKID=OFF \ -D WITH_FUSE=OFF \ From ec16ced98d3b97964ec72ff77a35f834fc15f26a Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Sun, 16 Oct 2016 14:28:07 +0200 Subject: [PATCH 2/2] ./do_freebsd.sh: remove pipe to get correct return value Signed-off-by: Willem Jan Withagen --- do_freebsd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/do_freebsd.sh b/do_freebsd.sh index f9e3029cd15..85a7b684f13 100755 --- a/do_freebsd.sh +++ b/do_freebsd.sh @@ -27,6 +27,6 @@ rm -rf build && ./do_cmake.sh "$*" \ 2>&1 | tee cmake.log cd build -gmake -j$NPROC V=1 VERBOSE=1 | tee build.log 2>&1 -gmake -j$NPROC check CEPH_BUFFER_NO_BENCH=yes | tee check.log 2>&1 +gmake -j$NPROC V=1 VERBOSE=1 +gmake -j$NPROC check CEPH_BUFFER_NO_BENCH=yes