From 7fc76fdc1e28312f8ab98fc39a33aa9342443afa Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 22 Oct 2021 15:08:59 +0200 Subject: [PATCH] benchmark: bump version switch to dev-cpp --- .../benchmark/benchmark-1.5.6.recipe | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) rename dev-libs/benchmark/benchmark-1.4.1.recipe => dev-cpp/benchmark/benchmark-1.5.6.recipe (66%) diff --git a/dev-libs/benchmark/benchmark-1.4.1.recipe b/dev-cpp/benchmark/benchmark-1.5.6.recipe similarity index 66% rename from dev-libs/benchmark/benchmark-1.4.1.recipe rename to dev-cpp/benchmark/benchmark-1.5.6.recipe index e94cbfd5b..9b0170c0b 100644 --- a/dev-libs/benchmark/benchmark-1.4.1.recipe +++ b/dev-cpp/benchmark/benchmark-1.5.6.recipe @@ -5,16 +5,19 @@ COPYRIGHT="2015-2017 Google Benchmark developers" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/google/benchmark/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="f8e525db3c42efc9c7f3bc5176a8fa893a9a9920bbd08cef30fb56a51854d60d" +CHECKSUM_SHA256="789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102" SOURCE_FILENAME="benchmark-$portVersion.tar.gz" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="!x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" benchmark$secondaryArchSuffix = $portVersion - lib:libbenchmark$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:libbenchmark_main$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libbenchmark$secondaryArchSuffix = $libVersionCompat + lib:libbenchmark_main$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -23,8 +26,8 @@ REQUIRES=" PROVIDES_devel=" benchmark${secondaryArchSuffix}_devel = $portVersion - devel:libbenchmark$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:libbenchmark_main$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libbenchmark$secondaryArchSuffix = $libVersionCompat + devel:libbenchmark_main$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" benchmark$secondaryArchSuffix == $portVersion base @@ -43,28 +46,21 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage benchmark$secondaryArchSuffix \ - "$libDir"/libbenchmark.so.0.0.0 \ - "$libDir"/libbenchmark_main.so.0.0.0 + "$libDir"/libbenchmark.so.$libVersion \ + "$libDir"/libbenchmark_main.so.$libVersion BUILD() { - mkdir -p build && cd build - - cmake $cmakeDirArgs \ + cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE='Release' \ -DBUILD_SHARED_LIBS:BOOL=ON \ - .. - make $jobArgs + -DBENCHMARK_ENABLE_GTEST_TESTS:BOOL=OFF + make -C build $jobArgs } INSTALL() { - cd build - make install - - mkdir -p $includeDir - mv $prefix/include/* $includeDir/ - rm -rf $prefix/include/ + make -C build install prepareInstalledDevelLibs libbenchmark libbenchmark_main fixPkgconfig @@ -77,6 +73,5 @@ INSTALL() TEST() { - cd build - make test + make -C test }