benchmark: update to 1.9.0

This commit is contained in:
Yang Kun 2024-08-22 19:15:25 +08:00
parent 171ef0abff
commit f5d0280cb2
2 changed files with 59 additions and 59 deletions

View File

@ -1,3 +1,15 @@
--- a/cmake/benchmark.pc.in
+++ b/cmake/benchmark.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Name: @PROJECT_NAME@
Description: Google microbenchmark framework
--- a/cmake/benchmark_main.pc.in
+++ b/cmake/benchmark_main.pc.in
@@ -1,4 +1,5 @@
@ -7,15 +19,3 @@
Name: @PROJECT_NAME@
Description: Google microbenchmark framework (with main() function)
--- a/cmake/benchmark.pc.in
+++ b/cmake/benchmark.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}@CMAKE_INSTALL_INCLUDEDIR@
Name: @PROJECT_NAME@
Description: Google microbenchmark framework

View File

@ -3,7 +3,7 @@
_realname=benchmark
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.8.5
pkgver=1.9.0
pkgrel=1
pkgdesc="A microbenchmark support library, by Google (mingw-w64)"
arch=('any')
@ -14,77 +14,77 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest")
# checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest")
source=("https://github.com/google/benchmark/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
"001-fix-pkgconfig-files.patch")
sha256sums=('d26789a2b46d8808a48a4556ee58ccc7c497fcd4c0af9b90197674a81e04798a'
'e88f53dc504e7e0a4eeacd474f0d5f63d5a14f5dca1fc45f817a07548ba3233f')
"0001-fix-pkgconfig-files.patch")
sha256sums=('35a77f46cc782b16fac8d3b107fbfbb37dcd645f7c28eee19f3b8e0758b48994'
'0f761dbc24ecc0f7dc902fd14cc16fdd448fb1b4204e08adbaee056fed8db1ef')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
for _patch in "$@"
do
msg2 "Applying ${_patch}"
patch -Nbp1 -i "${srcdir}/${_patch}"
done
}
# =========================================== #
prepare() {
cd ${_realname}-${pkgver}
patch -p1 -i "${srcdir}"/001-fix-pkgconfig-files.patch
cd "${_realname}-${pkgver}"
apply_patch_with_msg 0001-fix-pkgconfig-files.patch
}
build() {
declare -a extra_config
if check_option "debug" "n"; then
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
# Shared Build
mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
-DBENCHMARK_ENABLE_WERROR=OFF \
-DBENCHMARK_USE_BUNDLED_GTEST=OFF \
-DBENCHMARK_ENABLE_TESTING=OFF \
../${_realname}-${pkgver}
cmake -B "build-${MSYSTEM}-shared" -S "${_realname}-${pkgver}" -GNinja \
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-DBUILD_SHARED_LIBS=ON \
-DBENCHMARK_ENABLE_GTEST_TESTS=OFF \
-DBENCHMARK_ENABLE_LTO=ON \
-DBENCHMARK_ENABLE_WERROR=OFF \
-DBENCHMARK_USE_BUNDLED_GTEST=OFF \
"${extra_config[@]}"
${MINGW_PREFIX}/bin/cmake --build .
cmake --build "build-${MSYSTEM}-shared"
# Static Build
mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DBENCHMARK_ENABLE_WERROR=OFF \
-DBENCHMARK_USE_BUNDLED_GTEST=OFF \
-DBENCHMARK_ENABLE_TESTING=OFF \
../${_realname}-${pkgver}
cmake -B "build-${MSYSTEM}-static" -S "${_realname}-${pkgver}" -GNinja \
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-DBUILD_SHARED_LIBS=OFF \
-DBENCHMARK_ENABLE_GTEST_TESTS=OFF \
-DBENCHMARK_ENABLE_WERROR=OFF \
-DBENCHMARK_USE_BUNDLED_GTEST=OFF \
"${extra_config[@]}"
${MINGW_PREFIX}/bin/cmake --build .
cmake --build "build-${MSYSTEM}-static"
}
check() {
# Shared Check
cd "${srcdir}"/build-${MSYSTEM}-shared
${MINGW_PREFIX}/bin/cmake \
-DBENCHMARK_ENABLE_TESTING=ON \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake --build .
PATH=$PWD/src:$PATH ${MINGW_PREFIX}/bin/ctest.exe ./ || warning "Tests failed"
PATH=$PWD/src:$PATH cmake --build "build-${MSYSTEM}-shared" --target test || true
# Static Check
cd "${srcdir}"/build-${MSYSTEM}-static
${MINGW_PREFIX}/bin/cmake \
-DBENCHMARK_ENABLE_TESTING=ON \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake --build .
${MINGW_PREFIX}/bin/ctest.exe ./ || warning "Tests failed"
cmake --build "build-${MSYSTEM}-static" --target test || true
}
package() {
# Static Install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}"/build-${MSYSTEM}-static
DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}-static"
# Shared Install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install "${srcdir}"/build-${MSYSTEM}-shared
DESTDIR="${pkgdir}" cmake --install "build-${MSYSTEM}-shared"
# License
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \
-t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
}