cereal: Update to 1.2.2 (#3499)

4 files changed, 32 insertions, 16 deletions

diff --git a/var/spack/repos/builtin/packages/cereal/Boost.patch b/var/spack/repos/builtin/packages/cereal/Boost.patch
new file mode 100644
index 0000000000..fdc2a72208
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cereal/Boost.patch
@@ -0,0 +1,14 @@
+--- old/sandbox/CMakeLists.txt
++++ new/sandbox/CMakeLists.txt
+@@ -4,9 +4,11 @@
+ add_executable(sandbox_json sandbox_json.cpp)
+ add_executable(sandbox_rtti sandbox_rtti.cpp)
+
++if(Boost_FOUND)
+ add_executable(sandbox_vs sandbox_vs.cpp)
+ target_link_libraries(sandbox_vs sandbox_vs_dll)
+ include_directories(sandbox_shared_lib)
++endif(Boost_FOUND)
+
+ if(Boost_FOUND)
+   add_executable(performance performance.cpp)
diff --git a/var/spack/repos/builtin/packages/cereal/Boost2.patch b/var/spack/repos/builtin/packages/cereal/Boost2.patch
new file mode 100644
index 0000000000..f8edb2c479
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cereal/Boost2.patch
@@ -0,0 +1,10 @@
+--- old/unittests/CMakeLists.txt
++++ new/unittests/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
++if(NOT Boost_FOUND)
++ list(REMOVE_ITEM TESTS boost_variant.cpp)
++endif(Boost_FOUND)
+ 
+ # A semi-colon separated list of test sources that should not be automatically built with doctest 
+ set(SPECIAL_TESTS "portability_test.cpp")
diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py
index 0ce6ec593c..7f1f103a94 100644
--- a/var/spack/repos/builtin/packages/cereal/package.py
+++ b/var/spack/repos/builtin/packages/cereal/package.py
@@ -39,6 +39,7 @@ class Cereal(Package):
     homepage = "http://uscilab.github.io/cereal/"
     url      = "https://github.com/USCiLab/cereal/archive/v1.1.2.tar.gz"
 
+    version('1.2.2', '4c56c7b9499dba79404250ef9a040481')
     version('1.2.1', '64476ed74c19068ee543b53ad3992261')
     version('1.2.0', 'e372c9814696481dbdb7d500e1410d2b')
     version('1.1.2', '34d4ad174acbff005c36d4d10e48cbb9')
@@ -47,7 +48,9 @@ class Cereal(Package):
     version('1.0.0', 'd1bacca70a95cec0ddbff68b0871296b')
     version('0.9.1', '8872d4444ff274ce6cd1ed364d0fc0ad')
 
-    patch("Werror.patch")
+    patch("Boost.patch")
+    patch("Boost2.patch", when="@1.2.2:")
+    patch("pointers.patch")
 
     depends_on('cmake@2.6.2:', type='build')
 
@@ -57,7 +60,10 @@ class Cereal(Package):
 
         # configure
         # Boost is only used for self-tests, which we are not running (yet?)
-        cmake('.', '-DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE', *std_cmake_args)
+        cmake('.',
+              '-DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE',
+              '-DSKIP_PORTABILITY_TEST=TRUE',
+              *std_cmake_args)
 
         # Build
         make()
diff --git a/var/spack/repos/builtin/packages/cereal/Werror.patch b/var/spack/repos/builtin/packages/cereal/pointers.patch
index d39eaaffdb..39d17a2d54 100644
--- a/var/spack/repos/builtin/packages/cereal/Werror.patch
+++ b/var/spack/repos/builtin/packages/cereal/pointers.patch
@@ -1,17 +1,3 @@
---- old/sandbox/CMakeLists.txt
-+++ new/sandbox/CMakeLists.txt
-@@ -4,9 +4,11 @@
- add_executable(sandbox_json sandbox_json.cpp)
- add_executable(sandbox_rtti sandbox_rtti.cpp)
-
-+if(Boost_FOUND)
- add_executable(sandbox_vs sandbox_vs.cpp)
- target_link_libraries(sandbox_vs sandbox_vs_dll)
- include_directories(sandbox_shared_lib)
-+endif(Boost_FOUND)
-
- if(Boost_FOUND)
-   add_executable(performance performance.cpp)
 --- old/include/cereal/types/common.hpp
 +++ new/include/cereal/types/common.hpp
 @@ -106,14 +106,16 @@