From 62b4087c09ea22e98d364f5cacc92c53794ac322 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sun, 23 Jul 2017 16:35:16 +0200 Subject: gBenchmark: Development Package (#4847) * gBenchmark: Development Package Add the development version (master branch) of `gBenchmark` * gBenchmark: Remove Duplicate Remove duplicate `gbenchmark` library and keep its patch to remove the shipped -Werror --- .../repos/builtin/packages/benchmark/package.py | 16 ++++++- .../repos/builtin/packages/gbenchmark/package.py | 50 ---------------------- 2 files changed, 15 insertions(+), 51 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/gbenchmark/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index 9e2009750d..eecb9341d9 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -22,7 +22,6 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * @@ -32,5 +31,20 @@ class Benchmark(CMakePackage): homepage = "https://github.com/google/benchmark" url = "https://github.com/google/benchmark/archive/v1.1.0.tar.gz" + version('develop', branch='master', + git='https://github.com/google/benchmark.git') + version('1.1.0', '66b2a23076cf70739525be0092fc3ae3') version('1.0.0', '1474ff826f8cd68067258db75a0835b8') + + def patch(self): + filter_file( + r'add_cxx_compiler_flag..fstrict.aliasing.', + r'##### add_cxx_compiler_flag(-fstrict-aliasing)', + 'CMakeLists.txt' + ) + filter_file( + r'add_cxx_compiler_flag..Werror', + r'##### add_cxx_compiler_flag(-Werror', + 'CMakeLists.txt' + ) diff --git a/var/spack/repos/builtin/packages/gbenchmark/package.py b/var/spack/repos/builtin/packages/gbenchmark/package.py deleted file mode 100644 index 591a5403f0..0000000000 --- a/var/spack/repos/builtin/packages/gbenchmark/package.py +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the NOTICE and LICENSE files for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class Gbenchmark(CMakePackage): - """A microbenchmark support library""" - - homepage = "https://github.com/google/benchmark" - url = "https://github.com/google/benchmark/archive/v1.0.0.tar.gz" - - version('1.1.0', '8c539bbe2a212618fa87b6c38fba087100b6e4ae') - version('1.0.0', '4f778985dce02d2e63262e6f388a24b595254a93') - - def build_type(self): - return "Release" - - def patch(self): - filter_file( - r'add_cxx_compiler_flag..fstrict.aliasing.', - r'##### add_cxx_compiler_flag(-fstrict-aliasing)', - 'CMakeLists.txt' - ) - filter_file( - r'add_cxx_compiler_flag..Werror', - r'##### add_cxx_compiler_flag(-Werror', - 'CMakeLists.txt' - ) -- cgit v1.2.3-60-g2f50