use bundled boost instead of Debian's

since Ceph now requires boost_container, which is not
available in Debian Stretch
This commit is contained in:
Fabian Grünbichler 2017-05-23 14:11:46 +02:00
parent 7c673caec4
commit d3282a1e03
4 changed files with 6 additions and 74 deletions

View File

@ -1,28 +0,0 @@
From 22302166a96657850a29aed838a44774e7de13ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 20 Mar 2017 09:16:06 +0100
Subject: [PATCH 2/6] build with system boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
debian/rules | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/rules b/debian/rules
index f8fb811..3810602 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ extraopts += -DWITH_CEPHFS_JAVA=ON
extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
extraopts += -DCMAKE_INSTALL_SYSCONFDIR=/etc
+extraopts += -DWITH_SYSTEM_BOOST=ON
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
extraopts += -DBOOST_J=$(NUMJOBS)
--
2.1.4

View File

@ -1,7 +1,7 @@
From 70c45191ce08042685c958995f08da33daf5b252 Mon Sep 17 00:00:00 2001
From 73818f98fd6c2c7d3719bf59ecad9979c0d6b009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Tue, 21 Mar 2017 07:47:08 +0100
Subject: [PATCH 3/6] ceph-detect-init: support Debian Stretch
Subject: [PATCH 2/5] ceph-detect-init: support Debian Stretch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

View File

@ -1,7 +1,7 @@
From 6932e11c9ef71f6182bee690a7d985e12c9cb678 Mon Sep 17 00:00:00 2001
From b30a92874ff7829cfec9f52ee4b907811122f82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 22 Mar 2017 09:00:34 +0100
Subject: [PATCH 4/6] enable systemd targets by default
Subject: [PATCH 3/5] enable systemd targets by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 3 insertions(+)
diff --git a/debian/rules b/debian/rules
index 3810602..9c1b33c 100755
index f8fb811..e12913c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -124,6 +124,9 @@ override_dh_installinit:
@@ -123,6 +123,9 @@ override_dh_installinit:
dh_installinit -p ceph-base --name ceph --no-start
dh_installinit -p radosgw --no-start

View File

@ -1,40 +0,0 @@
From 088b229bb647c406170b0214b29c32a617f99bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 29 Mar 2017 09:10:54 +0200
Subject: [PATCH 5/6] Revert "debian: drop boost build dependencies"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
we build with system boost currently, so those are actually
valid for us.
This reverts commit 0d43b76268a41989dc0e285bfcf78b9f98386aaf.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
debian/control | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/control b/debian/control
index 1ae3a8a..8974d32 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,14 @@ Build-Depends: bc,
libbabeltrace-ctf-dev,
libbabeltrace-dev,
libblkid-dev (>= 2.17),
+ libboost-dev (>= 1.42),
+ libboost-program-options-dev (>= 1.42),
+ libboost-system-dev (>= 1.42),
+ libboost-thread-dev (>= 1.42),
+ libboost-regex-dev,
+ libboost-random-dev,
+ libboost-iostreams-dev (>= 1.42),
+ libboost-python-dev,
libcurl4-gnutls-dev,
libexpat1-dev,
libfcgi-dev,
--
2.1.4