From 43c6eac39351814e38de783fea8c4dcdc1acff26 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Sat, 10 Dec 2016 00:05:42 +0900 Subject: [PATCH] benchmark-1.1.0 --- benchmark/README | 43 ++++++------ benchmark/benchmark-1.0.0-1bl1.src.patch | 67 ------------------- ...1.cygport => benchmark-1.1.0-1bl1.cygport} | 10 ++- benchmark/benchmark-1.1.0-1bl1.src.patch | 36 ++++++++++ 4 files changed, 66 insertions(+), 90 deletions(-) delete mode 100644 benchmark/benchmark-1.0.0-1bl1.src.patch rename benchmark/{benchmark-1.0.0-1bl1.cygport => benchmark-1.1.0-1bl1.cygport} (81%) create mode 100644 benchmark/benchmark-1.1.0-1bl1.src.patch diff --git a/benchmark/README b/benchmark/README index b737593b5..0d0b1716f 100644 --- a/benchmark/README +++ b/benchmark/README @@ -3,42 +3,42 @@ benchmark A library to support the benchmarking of functions, similar to unit-tests. Runtime requirements: - cygwin-2.5.1-1 - libbenchmark-devel-1.0.0-1bl1 - libbenchmark0-1.0.0-1bl1 - libgcc1-5.3.0-5 - libstdc++6-5.3.0-5 - pkg-config-0.29-1 + cygwin-2.6.0-1 + libbenchmark-devel-1.1.0-1bl1 + libbenchmark1-1.1.0-1bl1 + libgcc1-5.4.0-1 + libstdc++6-5.4.0-1 + pkg-config-0.29.1-1 Build requirements: (besides corresponding -devel packages) binutils-2.25-4 - cmake-3.3.2-1 - cygport-0.21.1-1 - gcc-core-5.3.0-5 - gcc-g++-5.3.0-5 - make-4.1-1 + cmake-3.6.2-1 + cygport-0.23.0-1 + gcc-core-5.4.0-1 + gcc-g++-5.4.0-1 + make-4.2.1-1 Canonical website: https://github.com/google/benchmark Canonical download: - https://github.com/google/benchmark/archive/v1.0.0.tar.gz + https://github.com/google/benchmark/archive/v1.1.0.tar.gz ------------------------------------------- Build instructions: - 1. unpack benchmark-1.0.0-X-src.tar.xz + 1. unpack benchmark-1.1.0-X-src.tar.xz 2. if you use setup to install this src package, it will be unpacked under /usr/src automatically % cd /usr/src - % cygport ./benchmark-1.0.0-X.cygport all + % cygport ./benchmark-1.1.0-X.cygport all This will create: - /usr/src/benchmark-1.0.0-X-src.tar.xz - /usr/src/benchmark-1.0.0-X.tar.xz - /usr/src/libbenchmark0-1.0.0-X.tar.xz - /usr/src/libbenchmark-devel-1.0.0-X.tar.xz + /usr/src/benchmark-1.1.0-X-src.tar.xz + /usr/src/benchmark-1.1.0-X.tar.xz + /usr/src/libbenchmark1-1.1.0-X.tar.xz + /usr/src/libbenchmark-devel-1.1.0-X.tar.xz ------------------------------------------- @@ -51,8 +51,8 @@ Files included in the binary package: /usr/share/doc/benchmark/LICENSE /usr/share/doc/benchmark/README.md -(libbenchmark0) - /usr/bin/cygbenchmark-0.dll +(libbenchmark1) + /usr/bin/cygbenchmark-1.dll (libbenchmark-devel) /usr/include/benchmark/benchmark.h @@ -66,5 +66,8 @@ Files included in the binary package: Port Notes: +----- version 1.1.0-1bl1 ----- +Version bump. + ----- version 1.0.0-1bl1 ----- Initial release by fd0 diff --git a/benchmark/benchmark-1.0.0-1bl1.src.patch b/benchmark/benchmark-1.0.0-1bl1.src.patch deleted file mode 100644 index d701c51ff..000000000 --- a/benchmark/benchmark-1.0.0-1bl1.src.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/benchmark-1.0.0/CMakeLists.txt src/benchmark-1.0.0/CMakeLists.txt ---- origsrc/benchmark-1.0.0/CMakeLists.txt 2015-12-31 03:22:39.000000000 +0900 -+++ src/benchmark-1.0.0/CMakeLists.txt 2016-05-03 23:15:38.044313800 +0900 -@@ -110,3 +110,11 @@ if (BENCHMARK_ENABLE_TESTING) - enable_testing() - add_subdirectory(test) - endif() -+ -+SET(prefix ${CMAKE_INSTALL_PREFIX}) -+SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) -+SET(libdir ${CMAKE_INSTALL_PREFIX}/lib) -+SET(includedir ${CMAKE_INSTALL_PREFIX}/include) -+SET(VERSION "1.0.0") -+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) -+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/benchmark-1.0.0/benchmark.pc.in src/benchmark-1.0.0/benchmark.pc.in ---- origsrc/benchmark-1.0.0/benchmark.pc.in 1970-01-01 09:00:00.000000000 +0900 -+++ src/benchmark-1.0.0/benchmark.pc.in 2016-05-03 23:15:49.990667200 +0900 -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: benchmark -+Description: Microbenchmark support library -+Version: @VERSION@ -+Libs: -L${libdir} -lbenchmark -+Cflags: -I${includedir}/benchmark -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/benchmark-1.0.0/src/CMakeLists.txt src/benchmark-1.0.0/src/CMakeLists.txt ---- origsrc/benchmark-1.0.0/src/CMakeLists.txt 2015-12-31 03:22:39.000000000 +0900 -+++ src/benchmark-1.0.0/src/CMakeLists.txt 2016-05-03 23:12:43.220713900 +0900 -@@ -17,7 +17,7 @@ else() - message(FATAL_ERROR "Failed to determine the source files for the regular expression backend") - endif() - --add_library(benchmark ${SOURCE_FILES} ${RE_FILES}) -+add_library(benchmark SHARED ${SOURCE_FILES} ${RE_FILES}) - - - set_target_properties(benchmark PROPERTIES -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/benchmark-1.0.0/src/sysinfo.cc src/benchmark-1.0.0/src/sysinfo.cc ---- origsrc/benchmark-1.0.0/src/sysinfo.cc 2015-12-31 03:22:39.000000000 +0900 -+++ src/benchmark-1.0.0/src/sysinfo.cc 2016-05-03 23:06:57.119526000 +0900 -@@ -39,6 +39,8 @@ - #include - #include - -+#include -+ - #include "arraysize.h" - #include "check.h" - #include "cycleclock.h" -diff -buprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.guess -x config.log -x config.status -x config.sub -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.gem' -x .gitignore -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 origsrc/benchmark-1.0.0/src/walltime.cc src/benchmark-1.0.0/src/walltime.cc ---- origsrc/benchmark-1.0.0/src/walltime.cc 2015-12-31 03:22:39.000000000 +0900 -+++ src/benchmark-1.0.0/src/walltime.cc 2016-05-03 23:11:58.234455200 +0900 -@@ -23,6 +23,10 @@ - #include - #endif - -+#if defined(__CYGWIN__) -+extern "C" int gettimeofday(struct timeval *, void *); -+#endif -+ - #include - #include - #include diff --git a/benchmark/benchmark-1.0.0-1bl1.cygport b/benchmark/benchmark-1.1.0-1bl1.cygport similarity index 81% rename from benchmark/benchmark-1.0.0-1bl1.cygport rename to benchmark/benchmark-1.1.0-1bl1.cygport index f74adc251..f457ffd4d 100644 --- a/benchmark/benchmark-1.0.0-1bl1.cygport +++ b/benchmark/benchmark-1.1.0-1bl1.cygport @@ -7,6 +7,10 @@ DESCRIPTION="A library to support the benchmarking of functions, similar to unit inherit cmake +CYGCMAKE_ARGS=" + -DBUILD_SHARED_LIBS:BOOL=ON +" + src_test() { cd ${B} @@ -15,13 +19,13 @@ src_test() PKG_NAMES=" ${PN} - lib${PN}0 + lib${PN}1 lib${PN}-devel " benchmark_CONTENTS=" usr/share " -libbenchmark0_CONTENTS=" +libbenchmark1_CONTENTS=" usr/bin " libbenchmark_devel_CONTENTS=" @@ -29,5 +33,5 @@ libbenchmark_devel_CONTENTS=" usr/lib " benchmark_SUMMARY="${SUMMARY} (licensing & readmes)" -libbenchmark0_SUMMARY="${SUMMARY} (runtime)" +libbenchmark1_SUMMARY="${SUMMARY} (runtime)" libbenchmark_devel_SUMMARY="${SUMMARY} (development)" diff --git a/benchmark/benchmark-1.1.0-1bl1.src.patch b/benchmark/benchmark-1.1.0-1bl1.src.patch new file mode 100644 index 000000000..22f659381 --- /dev/null +++ b/benchmark/benchmark-1.1.0-1bl1.src.patch @@ -0,0 +1,36 @@ +--- origsrc/benchmark-1.1.0/CMakeLists.txt 2016-10-29 06:22:22.000000000 +0900 ++++ src/benchmark-1.1.0/CMakeLists.txt 2016-12-09 09:37:05.782572400 +0900 +@@ -22,6 +22,9 @@ get_git_version(GIT_VERSION) + + # Tell the user what versions we are using + string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION}) ++if(CYGWIN) ++ set(VERSION "1.1.0") ++endif() + message("-- Version: ${VERSION}") + + # The version of the libraries +@@ -177,3 +180,10 @@ if (BENCHMARK_ENABLE_TESTING) + enable_testing() + add_subdirectory(test) + endif() ++ ++SET(prefix ${CMAKE_INSTALL_PREFIX}) ++SET(exec_prefix ${CMAKE_INSTALL_PREFIX}) ++SET(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++SET(includedir ${CMAKE_INSTALL_PREFIX}/include) ++CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) ++INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +--- origsrc/benchmark-1.1.0/benchmark.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/benchmark-1.1.0/benchmark.pc.in 2016-12-09 09:41:23.027011100 +0900 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: benchmark ++Description: Microbenchmark support library ++Version: @VERSION@ ++Libs: -L${libdir} -lbenchmark ++Cflags: -I${includedir}/benchmark