update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / rabit / fix-file-conflict.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/rabit/fix-file-conflict.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/rabit/fix-file-conflict.patch
new file mode 100644 (file)
index 0000000..6656953
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/rabit/fix-file-conflict.patch
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt\r
+index 08330d9..a58d669 100644\r
+--- a/CMakeLists.txt\r
++++ b/CMakeLists.txt\r
+@@ -5,10 +5,16 @@ project(rabit VERSION 0.0.0)\r
+ option(RABIT_BUILD_TESTS "Build rabit tests" OFF)\r
+ option(RABIT_BUILD_MPI "Build MPI" OFF)\r
+ \r
++find_package(dmlc CONFIG REQUIRED)\r
++\r
+ add_library(rabit src/allreduce_base.cc src/allreduce_robust.cc src/engine.cc src/c_api.cc)\r
+ add_library(rabit_base src/allreduce_base.cc src/engine_base.cc src/c_api.cc)\r
+ add_library(rabit_empty src/engine_empty.cc src/c_api.cc)\r
+ \r
++target_link_libraries(rabit dmlc::dmlc)\r
++target_link_libraries(rabit_base dmlc::dmlc)\r
++target_link_libraries(rabit_empty dmlc::dmlc)\r
++\r
+ set(rabit_libs rabit rabit_base rabit_empty)\r
+ if(RABIT_BUILD_MPI)\r
+   find_package(MPI REQUIRED)\r
+@@ -22,7 +28,6 @@ if(RABIT_BUILD_TESTS)\r
+   add_library(rabit_mock STATIC src/allreduce_base.cc src/allreduce_robust.cc src/engine_mock.cc src/c_api.cc)\r
+   list(APPEND rabit_libs rabit_mock) # add to list to apply build settings, then remove\r
+ endif()\r
+-\r
+ foreach(lib ${rabit_libs})\r
+   #include "./internal/utils.h"  \r
+   target_include_directories(${lib} PUBLIC\r
+@@ -42,7 +47,8 @@ if(RABIT_BUILD_TESTS)\r
+   if(RABIT_BUILD_MPI)\r
+     add_executable(speed_test_mpi test/speed_test.cc)\r
+     target_link_libraries(speed_test_mpi rabit_mpi)\r
+-    install(TARGETS speed_test_mpi DESTINATION bin)    \r
++    install(TARGETS speed_test_mpi DESTINATION bin) \r
++    message("IN MPI ")    \r
+   endif()\r
+ endif()\r
+ \r
+diff --git a/include/rabit/serializable.h b/include/rabit/serializable.h\r
+index 4a3c2a1..0fd4154 100644\r
+--- a/include/rabit/serializable.h\r
++++ b/include/rabit/serializable.h\r
+@@ -9,7 +9,7 @@\r
+ #include <vector>\r
+ #include <string>\r
+ #include "./internal/utils.h"\r
+-#include "../dmlc/io.h"\r
++#include <dmlc/io.h>\r
+ \r
+ namespace rabit {\r
+ /*!\r