re-add boost build dependencies

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 59281507055af757d7510b7d49b214bf27d5c13c..c1cb820c77d63b709fa3a87ea8662c53693d8360 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,7 +1,7 @@
-From 9dd8e10bc63cafc99c348238d06454ed83bd4305 Mon Sep 17 00:00:00 2001
+From 5c8441e17b21f6b7cc9da641fff0a118a22df780 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:12:50 +0100
-Subject: [PATCH 1/5] update changelog
+Subject: [PATCH 1/6] update changelog
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0002-build-with-system-boost.patch b/patches/0002-build-with-system-boost.patch
index 709d9fc5209bd5d39d03cdabae2bec9828529bf1..e242059ec4e62e32dac391a2e53cf4a51a103b2e 100644 (file)
--- a/patches/0002-build-with-system-boost.patch
+++ b/patches/0002-build-with-system-boost.patch
@@ -1,7 +1,7 @@
-From 97f2e218d7978619617563afe313d5db717b63fd Mon Sep 17 00:00:00 2001
+From d77d3431209484bc107609a3326f67149ddd7924 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/5] build with system boost
+Subject: [PATCH 2/6] build with system boost
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
index e41f5a16935107a9ed6dd8c00214d5a34d044326..fb5315d17a3168e618263a0d8614220f88958c9b 100644 (file)
--- a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
+++ b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
@@ -1,7 +1,7 @@
-From 0b89f3a4f811281c7fbc76cdfc86c0e66cb65b90 Mon Sep 17 00:00:00 2001
+From e0c71b6fcd2908094f2d42311a1c5549dda2d448 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/5] ceph-detect-init: support Debian Stretch
+Subject: [PATCH 3/6] ceph-detect-init: support Debian Stretch
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0004-enable-systemd-targets-by-default.patch b/patches/0004-enable-systemd-targets-by-default.patch
index 51e892f29fed3808667d568959109294c411a77d..ac36c09d1dd746f4cb634b3cf9c09aee124e2f71 100644 (file)
--- a/patches/0004-enable-systemd-targets-by-default.patch
+++ b/patches/0004-enable-systemd-targets-by-default.patch
@@ -1,7 +1,7 @@
-From acc4326c324d2ee47e297ee8f28fadfa224557d5 Mon Sep 17 00:00:00 2001
+From 0362a74b5e615235de81c027ac456d9e0a9a1279 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/5] enable systemd targets by default
+Subject: [PATCH 4/6] enable systemd targets by default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

diff --git a/patches/0005-use-sockaddr_storage-for-IPv6-compat.patch b/patches/0005-use-sockaddr_storage-for-IPv6-compat.patch
index 89654266bbb41c7240af4ebd7725bf03c5f078be..f75b2cdeb1f22be5eeb570162bc91437557d00cf 100644 (file)
--- a/patches/0005-use-sockaddr_storage-for-IPv6-compat.patch
+++ b/patches/0005-use-sockaddr_storage-for-IPv6-compat.patch
@@ -1,7 +1,7 @@
-From a555fcbf33572390f8265c1f0b729407f097df60 Mon Sep 17 00:00:00 2001
+From 4858648bf48d110c960cd4a0261056805827b527 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 22 Mar 2017 16:13:50 +0100
-Subject: [PATCH 5/5] use sockaddr_storage for IPv6 compat
+Subject: [PATCH 5/6] use sockaddr_storage for IPv6 compat
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -57,7 +57,7 @@ index 72fe7de..a7dedf2 100644
    }
  
 diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc
-index ebce2d5..460168f 100644
+index 06d58e4..5f910d5 100644
 --- a/src/common/pick_address.cc
 +++ b/src/common/pick_address.cc
 @@ -32,7 +32,7 @@ static const struct sockaddr *find_ip_in_subnet_list(CephContext *cct,

diff --git a/patches/0006-Revert-debian-drop-boost-build-dependencies.patch b/patches/0006-Revert-debian-drop-boost-build-dependencies.patch
new file mode 100644 (file)
index 0000000..644ca65
--- /dev/null
+++ b/patches/0006-Revert-debian-drop-boost-build-dependencies.patch
@@ -0,0 +1,40 @@
+From 13ff68ad79668008e637bf75e83ace835248e8e8 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 6/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
+

diff --git a/patches/series b/patches/series
index 2fd7705fd6b2751b599140f134f36bffa68fe9d0..e1de413e0c436af9f2a907f10d5fdfcc6df0dcf2 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -3,3 +3,4 @@
 0003-ceph-detect-init-support-Debian-Stretch.patch
 0004-enable-systemd-targets-by-default.patch
 0005-use-sockaddr_storage-for-IPv6-compat.patch
+0006-Revert-debian-drop-boost-build-dependencies.patch