ceph/trunk/ceph-13.2.0-cflags.patch

   1 diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
   2 index d6572115a4..cc0bdddc9f 100644
   3 --- a/cmake/modules/BuildBoost.cmake
   4 +++ b/cmake/modules/BuildBoost.cmake
   5 @@ -62,7 +62,7 @@ function(do_build_boost version)
   6    else()
   7      list(APPEND boost_features "address-model=32")
   8    endif()
   9 -  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
  10 +  set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc <---XXX
  11    list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
  12
  13    list(FIND Boost_BUILD_COMPONENTS "python" with_python)
  14 diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt
  15 index 5a80aa539c..8d6ff5c8f0 100644
  16 --- a/src/compressor/zstd/CMakeLists.txt
  17 +++ b/src/compressor/zstd/CMakeLists.txt
  18 @@ -1,7 +1,7 @@
  19  # zstd
  20
  21  # libzstd - build it statically
  22 -set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3")
  23 +set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable $ENV{CFLAGS} -O3")
  24
  25  include(ExternalProject)
  26  ExternalProject_Add(zstd_ext