commit: 7d3bd77eca37425b9147acbb2edb705a6fcf99a4 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Tue Jul 10 20:51:28 2018 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Tue Jul 10 20:51:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3bd77e
sys-cluster/ceph: Add patch to remove -Werror (bug 660486) Closes: https://bugs.gentoo.org/660486 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sys-cluster/ceph/ceph-12.2.5.ebuild | 3 +- .../ceph/files/ceph-12.2.5-boost-sonames.patch | 165 +++++++++++++++++++++ sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch | 55 +++++++ 3 files changed, 222 insertions(+), 1 deletion(-) diff --git a/sys-cluster/ceph/ceph-12.2.5.ebuild b/sys-cluster/ceph/ceph-12.2.5.ebuild index c7805109ba2..000712b8e6f 100644 --- a/sys-cluster/ceph/ceph-12.2.5.ebuild +++ b/sys-cluster/ceph/ceph-12.2.5.ebuild @@ -128,6 +128,7 @@ PATCHES=( "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" "${FILESDIR}/ceph-12.2.4-cflags.patch" "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" + "${FILESDIR}/ceph-12.2.5-no-werror.patch" ) check-reqs_export_vars() { @@ -163,7 +164,7 @@ src_prepare() { cmake-utils_src_prepare if use system-boost; then - eapply "${FILESDIR}/ceph-12.2.4-boost-sonames.patch" + eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch" fi # remove tests that need root access diff --git a/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch new file mode 100644 index 00000000000..57482b3f27c --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.5-boost-sonames.patch @@ -0,0 +1,165 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa90ba65da..ea65dd4209 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -567,7 +567,7 @@ set(BOOST_COMPONENTS + set(BOOST_HEADER_COMPONENTS container) + + if(WITH_MGR) +- list(APPEND BOOST_COMPONENTS python) ++ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) + endif() + if(WITH_BOOST_CONTEXT) + list(APPEND BOOST_COMPONENTS context coroutine) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7aa8a4392e..111f669f2e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -622,13 +622,13 @@ set(ceph_common_objs + $<TARGET_OBJECTS:crush_objs>) + set(ceph_common_deps + json_spirit erasure_code rt ${LIB_RESOLV} +- Boost::thread +- Boost::system +- Boost::regex +- Boost::random +- Boost::program_options +- Boost::date_time +- Boost::iostreams ++ boost_thread ++ boost_system ++ boost_regex ++ boost_random ++ boost_program_options ++ boost_date_time ++ boost_iostreams + ${BLKID_LIBRARIES} + ${Backtrace_LIBRARIES} + ${BLKIN_LIBRARIES} +@@ -712,7 +712,7 @@ if (WITH_MGR) + $<TARGET_OBJECTS:heap_profiler_objs>) + target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr osdc client global-static common +- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) ++ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) + install(TARGETS ceph-mgr DESTINATION bin) + endif (WITH_MGR) + +@@ -885,7 +885,7 @@ set(ceph_mds_srcs + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common +- Boost::thread) ++ boost_thread) + install(TARGETS ceph-mds DESTINATION bin) + + add_subdirectory(erasure-code) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index f3999e3b01..0ce7fca1ba 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -148,7 +148,7 @@ add_executable(ceph_omapbench + ) + target_link_libraries(ceph_omapbench + librados +- Boost::program_options ++ boost_program_options + global + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} +@@ -202,7 +202,7 @@ if(${WITH_RADOSGW}) + cls_rgw_client + cls_user_client + cls_lock_client +- Boost::regex ++ boost_regex + ${BLKID_LIBRARIES} + ${CURL_LIBRARIES} + ${EXPAT_LIBRARIES} +@@ -232,7 +232,7 @@ if(${WITH_RADOSGW}) + cls_rgw_client + cls_user_client + cls_lock_client +- Boost::regex ++ boost_regex + ${BLKID_LIBRARIES} + ${CURL_LIBRARIES} + ${EXPAT_LIBRARIES} +diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt +index 9fba701e05..da3cbcfe96 100644 +--- a/src/test/bench/CMakeLists.txt ++++ b/src/test/bench/CMakeLists.txt +@@ -8,7 +8,7 @@ set(smalliobench_srcs + add_executable(ceph_smalliobench + ${smalliobench_srcs} + ) +-target_link_libraries(ceph_smalliobench librados Boost::program_options global ++target_link_libraries(ceph_smalliobench librados boost_program_options global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_smalliobenchrbd +@@ -27,7 +27,7 @@ if(WITH_RBD) + librados + os + global +- Boost::program_options ++ boost_program_options + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} + ) +@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs + add_executable(ceph_smalliobenchfs + ${ceph_smalliobenchfs_srcs} + ) +-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global ++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_smalliobenchdumb +@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs + add_executable(ceph_smalliobenchdumb + ${smalliobenchdumb_srcs} + ) +-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global ++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + # ceph_tpbench +@@ -73,7 +73,7 @@ set(tpbench_srcs + add_executable(ceph_tpbench + ${tpbench_srcs} + ) +-target_link_libraries(ceph_tpbench librados Boost::program_options global ++target_link_libraries(ceph_tpbench librados boost_program_options global + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + + install(TARGETS +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index 9f72fa3b48..665c977606 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global) + install(TARGETS ceph_radosacl DESTINATION bin) + + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) +-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) ++target_link_libraries(ceph-osdomap-tool os global boost_program_options) + install(TARGETS ceph-osdomap-tool DESTINATION bin) + + add_executable(ceph-monstore-tool + ceph_monstore_tool.cc + ../mgr/mgr_commands.cc) +-target_link_libraries(ceph-monstore-tool os global Boost::program_options) ++target_link_libraries(ceph-monstore-tool os global boost_program_options) + install(TARGETS ceph-monstore-tool DESTINATION bin) + install(PROGRAMS + ceph-monstore-update-crush.sh +@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool + ceph_objectstore_tool.cc + rebuild_mondb.cc + RadosDump.cc) +-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) + if(WITH_FUSE) + target_link_libraries(ceph-objectstore-tool fuse) + endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch new file mode 100644 index 00000000000..dd24e7819fe --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch @@ -0,0 +1,55 @@ +diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt ceph-12.2.5/src/rapidjson/CMakeLists.txt +--- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt 2018-07-09 11:18:09.188115751 -0700 ++++ ceph-12.2.5/src/rapidjson/CMakeLists.txt 2018-07-09 11:36:56.848639110 -0700 +@@ -50,7 +50,7 @@ + endif(CCACHE_FOUND) + + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") + if (RAPIDJSON_BUILD_CXX11) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +@@ -73,7 +73,7 @@ + endif() + endif() + elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers") + if (RAPIDJSON_BUILD_CXX11) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + endif() +diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt ceph-12.2.5/src/rocksdb/CMakeLists.txt +--- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt 2018-07-09 11:18:09.219115543 -0700 ++++ ceph-12.2.5/src/rocksdb/CMakeLists.txt 2018-07-09 11:34:58.843411195 -0700 +@@ -174,15 +174,6 @@ + PROPERTIES COMPILE_FLAGS "-msse4.2") + endif() + +-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) +-if(FAIL_ON_WARNINGS) +- if(MSVC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") +- else() # assume GCC +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- endif() +-endif() +- + option(WITH_ASAN "build with ASAN" OFF) + if(WITH_ASAN) + add_definitions(-DROCKSDB_TSAN_RUN) +diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile +--- ceph-12.2.5.orig/src/rocksdb/Makefile 2018-03-11 18:58:51.000000000 -0700 ++++ ceph-12.2.5/src/rocksdb/Makefile 2018-07-09 11:35:53.847049123 -0700 +@@ -243,11 +243,6 @@ + WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \ + -Wno-unused-parameter + +-ifndef DISABLE_WARNING_AS_ERROR +- WARNING_FLAGS += -Werror +-endif +- +- + ifdef LUA_PATH + + ifndef LUA_INCLUDE
