From ac1c1f6f0e12eeec00d87f9e1766f560f5b486db Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 1 Nov 2016 15:15:33 -0700 Subject: [PATCH] librados-dev: install inline_memory.h This is needed to compile against the c++ api since c38869232c3c852d98fa1826632db360c5a6afd4 Fixes: http://tracker.ceph.com/issues/17654 Signed-off-by: Josh Durgin --- ceph.spec.in | 1 + debian/librados-dev.install | 1 + src/include/CMakeLists.txt | 1 + src/include/buffer.h | 2 +- src/include/rados/inline_memory.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) create mode 120000 src/include/rados/inline_memory.h diff --git a/ceph.spec.in b/ceph.spec.in index cfe23a56882f..e8bd0ab93a1b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1341,6 +1341,7 @@ fi %{_includedir}/rados/librados.hpp %{_includedir}/rados/buffer.h %{_includedir}/rados/buffer_fwd.h +%{_includedir}/rados/inline_memory.h %{_includedir}/rados/page.h %{_includedir}/rados/crc32c.h %{_includedir}/rados/rados_types.h diff --git a/debian/librados-dev.install b/debian/librados-dev.install index c3231c96bb2d..c7f4eb1c1f9d 100644 --- a/debian/librados-dev.install +++ b/debian/librados-dev.install @@ -4,6 +4,7 @@ usr/include/rados/buffer_fwd.h usr/include/rados/crc32c.h usr/include/rados/librados.h usr/include/rados/librados.hpp +usr/include/rados/inline_memory.h usr/include/rados/page.h usr/include/rados/rados_types.h usr/include/rados/rados_types.hpp diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt index f4fd50defd9a..fc9cf7d0178b 100644 --- a/src/include/CMakeLists.txt +++ b/src/include/CMakeLists.txt @@ -4,6 +4,7 @@ install(FILES rados/librados.h rados/librados.hpp buffer.h buffer_fwd.h + inline_memory.h memory.h page.h crc32c.h diff --git a/src/include/buffer.h b/src/include/buffer.h index b0326bc79caa..cde7b9d5aa20 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -55,7 +55,7 @@ # include #endif -#include "include/inline_memory.h" +#include "inline_memory.h" #if __GNUC__ >= 4 #define CEPH_BUFFER_API __attribute__ ((visibility ("default"))) diff --git a/src/include/rados/inline_memory.h b/src/include/rados/inline_memory.h new file mode 120000 index 000000000000..48f0d4436bd0 --- /dev/null +++ b/src/include/rados/inline_memory.h @@ -0,0 +1 @@ +../inline_memory.h \ No newline at end of file -- 2.47.3