From 1c084cd4dd93fd300827875b913b286105b8a2da Mon Sep 17 00:00:00 2001 From: "Anthony J. Zukaitis" Date: Wed, 31 Mar 2021 22:35:00 -0600 Subject: [PATCH] Added version patch for 1.4.0 tag on mpark-variant (#22496) * Added version patch for 1.4.0 tag on mpark-variant Redirected urls to git and github tags. * Updated to commit hashes * Update var/spack/repos/builtin/packages/mpark-variant/package.py Co-authored-by: Axel Huebl * Update var/spack/repos/builtin/packages/mpark-variant/package.py Co-authored-by: Axel Huebl * Update var/spack/repos/builtin/packages/mpark-variant/package.py Co-authored-by: Anthony J Zukaitis Co-authored-by: Axel Huebl --- .../repos/builtin/packages/mpark-variant/package.py | 6 ++++-- .../builtin/packages/mpark-variant/version.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/mpark-variant/version.patch diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py index 86f3cf3a4d3..72bcc306da5 100644 --- a/var/spack/repos/builtin/packages/mpark-variant/package.py +++ b/var/spack/repos/builtin/packages/mpark-variant/package.py @@ -9,8 +9,9 @@ class MparkVariant(CMakePackage): """C++17 `std::variant` for C++11/14/17""" - homepage = "https://mpark.github.io/variant" - url = "https://github.com/mpark/variant/archive/v1.3.0.tar.gz" + homepage = "https://github.com/mpark/variant" + url = "https://github.com/mpark/variant/archive/v1.4.0.tar.gz" + git = "https://github.com/mpark/variant.git" maintainers = ['ax3l'] version('1.4.0', sha256='8f6b28ab3640b5d76d5b6664dda7257a4405ce59179220431b8fd196c79b2ecb') @@ -18,6 +19,7 @@ class MparkVariant(CMakePackage): # Ref.: https://github.com/mpark/variant/pull/73 patch('nvcc.patch', when='@:1.4.0') + patch('version.patch', when='@1.4.0') cxx11_msg = 'MPark.Variant needs a C++11-capable compiler. ' \ 'See https://github.com/mpark/variant#requirements' diff --git a/var/spack/repos/builtin/packages/mpark-variant/version.patch b/var/spack/repos/builtin/packages/mpark-variant/version.patch new file mode 100644 index 00000000000..56db93c87eb --- /dev/null +++ b/var/spack/repos/builtin/packages/mpark-variant/version.patch @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt 2021-02-21 17:27:04.709115800 -0700 ++++ ./CMakeLists.txt.new 2021-02-21 17:27:35.589115800 -0700 +@@ -7,7 +7,7 @@ + + cmake_minimum_required(VERSION 3.6.3) + +-project(MPark.Variant VERSION 1.3.0 LANGUAGES CXX) ++project(MPark.Variant VERSION 1.4.0 LANGUAGES CXX) + + # Option. + set(MPARK_VARIANT_INCLUDE_TESTS "" CACHE STRING