mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
ccache, revbump, drop fmt devel files/package (#11183)
this caused a conflict between ccache_devel and libfmt_devel
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user