]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph.spec.in: disable lttng and babeltrace explicitly 8440/head
authorLoic Dachary <ldachary@redhat.com>
Tue, 5 Apr 2016 09:53:54 +0000 (11:53 +0200)
committerLoic Dachary <ldachary@redhat.com>
Tue, 5 Apr 2016 09:59:20 +0000 (11:59 +0200)
commit77a4ed0a8986b2529edd8059dd3efa38f778c6f2
treef68161369b7c0c83e23c5c2bcecc16f518c8896a
parent7cfc739a513da84d76b959efc51dd21c1cc552d6
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: trivial resolution, the context changed
        (other packages, files etc.) but the semantic did not
ceph.spec.in