Hello community, here is the log from the commit of package benchmark for openSUSE:Factory checked in at 2017-01-31 12:41:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/benchmark (Old) and /work/SRC/openSUSE:Factory/.benchmark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "benchmark" Changes: -------- --- /work/SRC/openSUSE:Factory/benchmark/benchmark.changes 2016-11-14 20:15:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.benchmark.new/benchmark.changes 2017-02-03 17:31:57.665446816 +0100 @@ -1,0 +2,16 @@ +Fri Jan 27 14:46:11 UTC 2017 - mplus...@suse.com + +- Update to version 1.1.0: + * ArgNames support + * Fixes for OSX and Cygwin and MSVC builds + * PauseTiming and ResumeTiming are per thread (#286) + * Better Range and Arg specifications + * Complexity reporting + +------------------------------------------------------------------- +Fri Jan 27 14:28:26 UTC 2017 - b...@suse.com + +- add support for s390x: + * benchmark-s390.patch + +------------------------------------------------------------------- Old: ---- benchmark-1.0.0.tar.gz New: ---- benchmark-1.1.0.tar.gz benchmark-s390.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ benchmark.spec ++++++ --- /var/tmp/diff_new_pack.2pzwuO/_old 2017-02-03 17:31:58.009398135 +0100 +++ /var/tmp/diff_new_pack.2pzwuO/_new 2017-02-03 17:31:58.009398135 +0100 @@ -1,7 +1,7 @@ # # spec file for package benchmark # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,19 @@ %define soname lib%{name} %define sover 0 Name: benchmark -Version: 1.0.0 +Version: 1.1.0 Release: 0 Summary: A microbenchmark support library License: Apache-2.0 Group: Development/Libraries/C and C++ Url: https://github.com/google/benchmark Source: https://github.com/google/benchmark/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM benchmark-s390.patch +Patch: benchmark-s390.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 x86_64 +ExclusiveArch: %ix86 x86_64 s390x %description A library to support the benchmarking of functions, similar to unit-tests. @@ -52,6 +53,7 @@ %prep %setup -q +%patch %build %if %{__isa_bits} == 64 @@ -59,9 +61,8 @@ %endif %cmake \ -DBENCHMARK_ENABLE_LTO=off \ - -DBENCHMARK_ENABLE_TESTING=true \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -make %{?_smp_mflags} + -DBENCHMARK_ENABLE_TESTING=true +%make_jobs %install %cmake_install ++++++ benchmark-1.0.0.tar.gz -> benchmark-1.1.0.tar.gz ++++++ ++++ 9641 lines of diff (skipped) ++++++ benchmark-s390.patch ++++++ Index: src/cycleclock.h =================================================================== --- src/cycleclock.h.orig +++ src/cycleclock.h @@ -132,6 +132,11 @@ inline BENCHMARK_ALWAYS_INLINE int64_t N struct timeval tv; gettimeofday(&tv, nullptr); return static_cast<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec; +#elif defined(__s390__) + // found this for papi package + unsigned long long ret; + __asm__("stck 0(%0)" : : "a" (&(ret)) : "memory", "cc"); + return (long long)ret; #else // The soft failover to a generic implementation is automatic only for ARM. // For other platforms the developer is expected to make an attempt to create