]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph.spec.in: disable lttng and babeltrace explicitly 8589/head
authorKefu Chai <kchai@redhat.com>
Tue, 1 Mar 2016 05:51:09 +0000 (13:51 +0800)
committerDan Mick <dan.mick@redhat.com>
Fri, 15 Apr 2016 02:23:34 +0000 (19:23 -0700)
commitb338815ec9fa1fe2f8c3d4267fdbb1633e465ec2
tree74771452ec019cd8a8eecd421c82473907d082f1
parent6b72dac33f3e04707f24879adbb2d9328e39d43e
ceph.spec.in: disable lttng and babeltrace explicitly

before this change, we do not pacakge tracepoint probe shared libraries
on rhel7. but "configure" script enables them if lttng is detected. and
rpm complains at seeing installed but not pacakged files. as EPEL-7 now
includes lttng-ust-devel and libbabeltrace-devel, we'd better
BuildRequire them, and build with them unless disabled otherwise. so in
this change
* make "lttng" an rpm build option enabled by default
* BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng"
 "lttng" option is enabled
* --without-lttng --without-babeltrace if the "lttng" option is disabled

Fixes: #14844
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f1a44907a2f83cb8080cd8ab5980a30306a33fbd)

Conflicts:
ceph.spec.in
ceph.spec.in