From 0dd55910c70f3f4f0e2574da4d29fb982a7aabe9 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 3 Oct 2024 18:22:15 +0200 Subject: [PATCH] ccache, revbump, drop fmt devel files/package (#11183) this caused a conflict between ccache_devel and libfmt_devel --- dev-util/ccache/ccache-4.10.recipe | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dev-util/ccache/ccache-4.10.recipe b/dev-util/ccache/ccache-4.10.recipe index ef5bdf973..cf3dbb088 100644 --- a/dev-util/ccache/ccache-4.10.recipe +++ b/dev-util/ccache/ccache-4.10.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2002-2007 Andrew Tridgell 2009-2022 Joel Rosdahl and other contributors" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/ccache/ccache/releases/download/v$portVersion/ccache-$portVersion.tar.xz" CHECKSUM_SHA256="83630b5e922b998ab2538823e0cad962c0f956fad1fcf443dd5288269a069660" PATCHES="ccache-$portVersion.patchset" @@ -32,22 +32,18 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libfmt$secondaryArchSuffix lib:libhiredis$secondaryArchSuffix + lib:libxxhash$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libzstd$secondaryArchSuffix " -PROVIDES_devel=" - ccache${secondaryArchSuffix}_devel = $portVersion - devel:libfmt$secondaryArchSuffix - " -REQUIRES_devel=" - ccache$secondaryArchSuffix == $portVersion base - " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + libfmt${secondaryArchSuffix}_devel >= 8 devel:libhiredis$secondaryArchSuffix + devel:libxxhash$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzstd$secondaryArchSuffix " @@ -73,7 +69,8 @@ BUILD() cmake -B build -S . \ $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_BINDIR=$commandBinDir + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DENABLE_TESTING=OFF make -C build $jobArgs } @@ -81,14 +78,6 @@ INSTALL() { make -C build install echo "# System-wide configuration for ccache" > $settingsDir/ccache.conf - - prepareInstalledDevelLib \ - libfmt - fixPkgconfig - - packageEntries devel \ - $developDir \ - $libDir/cmake } TEST()