Skip to content

Commit 2af2598

Browse files
committed
do not build systemtap support for RPM/DEB packages
Change-Id: Id08017c002ede2c8f2087875ae2f77b0be5e6d23 Reviewed-on: https://review.couchbase.org/c/libcouchbase/+/206621 Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
1 parent 688b59a commit 2af2598

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

packaging/deb/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
44

5-
DH_AC_FLAGS=--buildsystem=cmake -- -DLCB_NO_MOCK=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLCB_USE_HDR_HISTOGRAM=OFF
5+
DH_AC_FLAGS=--buildsystem=cmake -- -DLCB_NO_MOCK=1 -DLCB_BUILD_DTRACE=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLCB_USE_HDR_HISTOGRAM=OFF
66
DH_AT_CMD = dh_auto_build --verbose --parallel -- alltests
77
ifdef DEB_HOST_MULTIARCH
88
DH_AC_FLAGS += -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

packaging/rpm/libcouchbase.spec.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ BuildRequires: cmake >= 3.5.1
1616
BuildRequires: pkgconfig(libevent) >= 2
1717
BuildRequires: libev-devel >= 3
1818
BuildRequires: openssl11-devel
19-
BuildRequires: systemtap-sdt-devel, systemtap-devel
2019
URL: https://developer.couchbase.com/server/other-products/release-notes-archives/c-sdk
2120
Source: https://packages.couchbase.com/clients/c/@TARREDAS@.tar.gz
2221
BuildRoot: %{_topdir}/build/@TARREDAS@
@@ -65,7 +64,7 @@ Development files for the Couchbase Client & Protocol Library
6564

6665
%prep
6766
%autosetup -p1 -n@TARREDAS@
68-
%cmake3 -DLCB_NO_MOCK=1 -DLCB_BUILD_LIBUV=OFF -DLCB_USE_HDR_HISTOGRAM=OFF -B . -S .
67+
%cmake3 -DLCB_NO_MOCK=1 -DLCB_BUILD_DTRACE=0 -DLCB_BUILD_LIBUV=OFF -DLCB_USE_HDR_HISTOGRAM=OFF -B . -S .
6968

7069
%build
7170
%make_build

0 commit comments

Comments
 (0)