rpms
/
stdair
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to fix the FTBFS issue related to new Boost 1.63 serialization

This commit is contained in:
Denis Arnaud 2017-02-25 21:08:29 +01:00
parent 83d6d3de6f
commit f876387c91
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stdair-fix-protected-pointer-with-boost-archive.patch
View File

@ -1,15 +1,14 @@
diff --git a/config/project_config_embeddable.cmake b/config/project_config_embeddable.cmake
index b9f38e6..a115cb0 100644
index b9f38e6..07901ff 100644
--- a/config/project_config_embeddable.cmake
+++ b/config/project_config_embeddable.cmake
@@ -165,6 +165,10 @@ macro (set_project_options _build_doc _enable_tests _run_gcov)
set (BASICDOC_FILES AUTHORS ${DOC_NEWS_FILE} README ${DOC_INSTALL_FILE})
set (BASICDOC_PATH "share/doc/${PACKAGE}")
@@ -1387,6 +1387,9 @@ macro (init_build)
if (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VERSION=${Boost_VERSION}")
endif (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=")
+ ##
+ # Work around for new Boost 1.63 serialization code
+ set (DONT_USE_HAS_NEW_OPERATOR 1)
+
endmacro (set_project_options)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDONT_USE_HAS_NEW_OPERATOR=1")
#
#
include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})