zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gBenchmark: Development Package (#4847)

Browse Source 
* 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
This commit is contained in:
Axel Huebl 2017-07-23 16:35:16 +02:00 committed by Adam J. Stewart
parent f159246d1d
commit 62b4087c09
2 changed files with 15 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/benchmark/package.py
View File

@ -22,7 +22,6 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
@ -32,5 +31,20 @@ class Benchmark(CMakePackage):
homepage = "https://github.com/google/benchmark" homepage = "https://github.com/google/benchmark"
url = "https://github.com/google/benchmark/archive/v1.1.0.tar.gz" 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.1.0', '66b2a23076cf70739525be0092fc3ae3')
version('1.0.0', '1474ff826f8cd68067258db75a0835b8') 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'
)

50
var/spack/repos/builtin/packages/gbenchmark/package.py
View File

@ -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'
)