mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-29 11:38:52 +02:00
tox: bump, use _tools package (#13839)
* tox: bump, use _tools package * tox: remove an accidentally left in ls * tox: use SOURCE_DIR_2
This commit is contained in:
@@ -10,11 +10,12 @@ LICENSE="GNU GPL v3
|
|||||||
MIT"
|
MIT"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/TokTok/c-toxcore/archive/v$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/TokTok/c-toxcore/archive/v$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="4919f85b7ab076fb64a9d18b7e951bced2709a870a7553529948a21d472f3c0b"
|
CHECKSUM_SHA256="68849c67e3b7161eca74aa19bb978f7e7045042356346fb28b5ef88a13b7a434"
|
||||||
SOURCE_DIR="c-toxcore-$portVersion"
|
SOURCE_DIR="c-toxcore-$portVersion"
|
||||||
srcGitRev2="e836703291392aba9db92b46fb47929521fac71f"
|
srcGitRev2="52bfcfa17d2eb4322da2037ad625f5575129cece"
|
||||||
SOURCE_URI_2="https://github.com/camgunz/cmp/archive/$srcGitRev2.tar.gz"
|
SOURCE_URI_2="https://github.com/camgunz/cmp/archive/$srcGitRev2.tar.gz"
|
||||||
CHECKSUM_SHA256_2="791ed2eaae05d75a6ef1c3fcad4edd595aba80a0be050067ec147d1cd94ec13a"
|
CHECKSUM_SHA256_2="4abfd641dd5ccba04b6e0ced04a79755fa70709290b3ba15dbd4b4a2de345ed0"
|
||||||
|
SOURCE_DIR_2="cmp-$srcGitRev2"
|
||||||
PATCHES="tox-$portVersion.patchset"
|
PATCHES="tox-$portVersion.patchset"
|
||||||
|
|
||||||
ARCHITECTURES="all !x86_gcc2"
|
ARCHITECTURES="all !x86_gcc2"
|
||||||
@@ -28,17 +29,28 @@ else
|
|||||||
commandBinDir=$prefix/bin
|
commandBinDir=$prefix/bin
|
||||||
fi
|
fi
|
||||||
|
|
||||||
libVersion="2.12.0"
|
libVersion="2.22.0"
|
||||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||||
|
|
||||||
PROVIDES="
|
PROVIDES="
|
||||||
tox$secondaryArchSuffix = $portVersion
|
tox$secondaryArchSuffix = $portVersion
|
||||||
cmd:DHT_bootstrap$commandSuffix = $portVersion
|
|
||||||
cmd:tox_bootstrapd$commandSuffix = $portVersion
|
|
||||||
lib:libtoxcore$secondaryArchSuffix = $libVersionCompat
|
lib:libtoxcore$secondaryArchSuffix = $libVersionCompat
|
||||||
"
|
"
|
||||||
REQUIRES="
|
REQUIRES="
|
||||||
haiku$secondaryArchSuffix
|
haiku$secondaryArchSuffix
|
||||||
|
lib:libopus$secondaryArchSuffix
|
||||||
|
lib:libsodium$secondaryArchSuffix
|
||||||
|
lib:libvpx$secondaryArchSuffix
|
||||||
|
"
|
||||||
|
|
||||||
|
PROVIDES_tools="
|
||||||
|
tox_tools$secondaryArchSuffix = $portVersion
|
||||||
|
cmd:DHT_bootstrap$commandSuffix = $portVersion
|
||||||
|
cmd:tox_bootstrapd$commandSuffix = $portVersion
|
||||||
|
"
|
||||||
|
REQUIRES_tools="
|
||||||
|
haiku$secondaryArchSuffix
|
||||||
|
lib:libtoxcore$secondaryArchSuffix == $libVersionCompat
|
||||||
lib:libconfig$secondaryArchSuffix
|
lib:libconfig$secondaryArchSuffix
|
||||||
lib:libopus$secondaryArchSuffix
|
lib:libopus$secondaryArchSuffix
|
||||||
lib:libsodium$secondaryArchSuffix
|
lib:libsodium$secondaryArchSuffix
|
||||||
@@ -74,7 +86,8 @@ BUILD_PREREQUIRES="
|
|||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
cp -r $sourceDir2/cmp-$srcGitRev2/* third_party/cmp
|
rm -df third_party/cmp
|
||||||
|
ln -s $sourceDir2 third_party/cmp
|
||||||
|
|
||||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||||
$cmakeDirArgs \
|
$cmakeDirArgs \
|
||||||
@@ -97,6 +110,10 @@ INSTALL()
|
|||||||
|
|
||||||
packageEntries devel \
|
packageEntries devel \
|
||||||
$developDir
|
$developDir
|
||||||
|
|
||||||
|
packageEntries tools \
|
||||||
|
$dataDir \
|
||||||
|
$binDir
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST()
|
TEST()
|
||||||
Reference in New Issue
Block a user