Commit Graph

21 Commits

Author SHA1 Message Date
Brad Hubbard
f313ea3948 do_cmake.sh: Add a heading to the minimal config
Post #28634 the minimal ceph config is invalid without a header.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2019-06-28 15:46:30 +10:00
Nathan Cutler
ac8d7c5fd4 do_cmake.sh: use bash
Fixes: http://tracker.ceph.com/issues/39981
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-05-20 17:01:40 +02:00
Willem Jan Withagen
46b3d671b4 build: FreeBSD does not have /etc/os-release
So "manually" set requirements

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2019-03-04 11:33:38 +01:00
Nathan Cutler
18d2b2a603 do_cmake.sh: SUSE builds need WITH_RADOSGW_AMQP_ENDPOINT=OFF
Without this patch, "make check" fails on SUSE systems because
WITH_RADOS_AMQP_ENDPOINT defaults to "ON".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-02-28 14:56:55 +01:00
Mark Nelson
d433522ae9 do_cmake: Warn user about slow debug performance by default.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2018-12-12 12:09:57 -06:00
Nathan Cutler
a691122a4e build/ops: do_cmake.sh: automate py3 build options for certain distros
Before this patch, run-make-check.sh was setting the cmake options for
py3 build based only on the absence of a python2 binary in the system.
This was not sufficiently deterministic, and it didn't help folks who
run do_cmake.sh directly.

With this patch, we explicitly force the py3 build in do_cmake.sh, for
those OS types/versions we know need it.

Fixes: https://tracker.ceph.com/issues/37330
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-11-21 16:51:16 +01:00
Sage Weil
7e6a57bd26 do_cmake.sh: default to Debug build
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 10:27:04 -05:00
Kefu Chai
79b55473ef run-make-check,do_cmake: set BOOST_J if !WITH_SYSTEM_BOOS
it's also more readable if we can set the number of make jobs
in a single place.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-11 22:22:47 +08:00
Kefu Chai
5868e496fa do_cmake: fail if cmake fails
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-26 16:50:37 +08:00
Kefu Chai
af2c91ace6 deb,rpm,do_cmake: switch to cmake3
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-06 13:29:21 +08:00
Nathan Cutler
7a17722d45 build/ops: do_cmake.sh: get rid of which dependency
"which" is not available on minimal systems, whereas "type" is a shell builtin,
so the chances of the command "just working" are greater with type than with
which.

In other parts of Ceph build/ops we have replaced "which" with "type" to good
effect.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-04-23 10:50:04 +02:00
Abhishek Lekshmanan
9b99018b99 build: do_cmake: allow ARGS to be overridden
so that one can do stuff like
ARGS="-DCMAKE_C_COMPILER=gcc-7 -D.." ./do_cmake.sh

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-10 18:02:29 +01:00
Shinobu Kinjo
5a3eed74d8 vstart.sh: drop .ceph_port and use randomly selected available port
vstart.sh becomes independent of do_cmake.sh

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
2017-12-01 12:16:06 +09:00
Alan Somers
44c6a47fb6 do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD
Use sysctl(8) instead.  Also, there's no longer any need for /bin/bash
on FreeBSD.

Signed-off-by: Alan Somers <asomers@gmail.com>
2017-09-25 16:24:06 -06:00
Dan Mick
137f3018cd do_cmake.sh: fix syntax for /bin/sh (doesn't have +=)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-07-19 15:04:47 -07:00
Sage Weil
f251b07e5d do_cmake.sh: enable ccache if installed
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-01 12:25:11 -04:00
Sage Weil
feefd35853 do_cmake.sh: set BOOST_J to $(nproc)
This lets us build boost with all processors.

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-11-07 15:56:53 -05:00
Willem Jan Withagen
ea708e749b 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 <wjw@digiware.nl>
2016-10-12 11:06:00 +02:00
Sage Weil
c8a06ce1ee do_cmake.sh: set .ceph_port to random port
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-03 18:40:07 -04:00
Sage Weil
6732ef05ac do_cmake.sh: create initial ceph.conf setting dirs
This is enough for unit tests to run.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-30 11:06:21 -04:00
Sage Weil
ef5a677870 do_cmake.sh: simple cmake helper
Signed-off-by: Sage Weil <sage@redhat.com>
2016-06-22 16:42:37 -04:00