haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

xapian: switch to commandBinDir, fix {PROVIDES,REQUIRES}_devel.

Browse Source
This commit is contained in:
fbrosson
2018-02-02 18:22:01 +00:00
parent 38da349060
commit 71a53f5b8a
2 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dev-libs/xapian/xapian-1.2.25.recipe
View File

@@ -8,7 +8,7 @@ native Unicode support and modern search algorithms."
HOMEPAGE="https://xapian.org/"
COPYRIGHT="1999-2017 The Xapian Authors"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://oligarchy.co.uk/xapian/$portVersion/xapian-core-$portVersion.tar.xz"
CHECKSUM_SHA256="7c77ff259bc92414c620015d6798f5f3e2c52907936096ec97c23c17fc0d6403"
SOURCE_DIR="xapian-core-$portVersion"
@@ -16,28 +16,35 @@ SOURCE_DIR="xapian-core-$portVersion"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libVersion="22.7.3"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
xapian$secondaryArchSuffix = $portVersion
lib:libxapian$secondaryArchSuffix = $libVersionCompat
cmd:copydatabase$secondaryArchSuffix = $portVersion
cmd:delve$secondaryArchSuffix = $portVersion
cmd:quest$secondaryArchSuffix = $portVersion
cmd:simpleexpand$secondaryArchSuffix = $portVersion
cmd:simpleindex$secondaryArchSuffix = $portVersion
cmd:simplesearch$secondaryArchSuffix = $portVersion
cmd:xapian_check$secondaryArchSuffix = $portVersion
cmd:xapian_chert_update$secondaryArchSuffix = $portVersion
cmd:xapian_compact$secondaryArchSuffix = $portVersion
cmd:xapian_config$secondaryArchSuffix = $portVersion
cmd:xapian_inspect$secondaryArchSuffix = $portVersion
cmd:xapian_metadata$secondaryArchSuffix = $portVersion
cmd:xapian_progsrv$secondaryArchSuffix = $portVersion
cmd:xapian_replicate$secondaryArchSuffix = $portVersion
cmd:xapian_replicate_server$secondaryArchSuffix = $portVersion
cmd:xapian_tcpsrv$secondaryArchSuffix = $portVersion
cmd:copydatabase$commandSuffix = $portVersion
cmd:delve$commandSuffix = $portVersion
cmd:quest$commandSuffix = $portVersion
cmd:simpleexpand$commandSuffix = $portVersion
cmd:simpleindex$commandSuffix = $portVersion
cmd:simplesearch$commandSuffix = $portVersion
cmd:xapian_check$commandSuffix = $portVersion
cmd:xapian_chert_update$commandSuffix = $portVersion
cmd:xapian_compact$commandSuffix = $portVersion
cmd:xapian_config$commandSuffix = $portVersion
cmd:xapian_inspect$commandSuffix = $portVersion
cmd:xapian_metadata$commandSuffix = $portVersion
cmd:xapian_progsrv$commandSuffix = $portVersion
cmd:xapian_replicate$commandSuffix = $portVersion
cmd:xapian_replicate_server$commandSuffix = $portVersion
cmd:xapian_tcpsrv$commandSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -46,11 +53,11 @@ REQUIRES="
"
PROVIDES_devel="
xapian${secondaryArchSuffix} = $portVersion
xapian${secondaryArchSuffix}_devel = $portVersion
devel:libxapian$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
xapian$secondaryArchSuffix
xapian$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
@@ -72,7 +79,7 @@ defineDebugInfoPackage xapian$secondaryArchSuffix \
BUILD()
{
runConfigure ./configure
runConfigure --omit-dirs binDir ./configure --bindir $commandBinDir
make $jobArgs
}

45
dev-libs/xapian/xapian-1.4.5.recipe
View File

@@ -16,28 +16,35 @@ SOURCE_DIR="xapian-core-$portVersion"
ARCHITECTURES="!x86_gcc2 !x86_64"
SECONDARY_ARCHITECTURES="!x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libVersion="30.4.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
xapian$secondaryArchSuffix = $portVersion
lib:libxapian$secondaryArchSuffix = $libVersionCompat
cmd:copydatabase$secondaryArchSuffix = $portVersion
cmd:delve$secondaryArchSuffix = $portVersion
cmd:quest$secondaryArchSuffix = $portVersion
cmd:simpleexpand$secondaryArchSuffix = $portVersion
cmd:simpleindex$secondaryArchSuffix = $portVersion
cmd:simplesearch$secondaryArchSuffix = $portVersion
cmd:xapian_check$secondaryArchSuffix = $portVersion
cmd:xapian_chert_update$secondaryArchSuffix = $portVersion
cmd:xapian_compact$secondaryArchSuffix = $portVersion
cmd:xapian_config$secondaryArchSuffix = $portVersion
cmd:xapian_inspect$secondaryArchSuffix = $portVersion
cmd:xapian_metadata$secondaryArchSuffix = $portVersion
cmd:xapian_progsrv$secondaryArchSuffix = $portVersion
cmd:xapian_replicate$secondaryArchSuffix = $portVersion
cmd:xapian_replicate_server$secondaryArchSuffix = $portVersion
cmd:xapian_tcpsrv$secondaryArchSuffix = $portVersion
cmd:copydatabase$commandSuffix = $portVersion
cmd:delve$commandSuffix = $portVersion
cmd:quest$commandSuffix = $portVersion
cmd:simpleexpand$commandSuffix = $portVersion
cmd:simpleindex$commandSuffix = $portVersion
cmd:simplesearch$commandSuffix = $portVersion
cmd:xapian_check$commandSuffix = $portVersion
cmd:xapian_chert_update$commandSuffix = $portVersion
cmd:xapian_compact$commandSuffix = $portVersion
cmd:xapian_config$commandSuffix = $portVersion
cmd:xapian_inspect$commandSuffix = $portVersion
cmd:xapian_metadata$commandSuffix = $portVersion
cmd:xapian_progsrv$commandSuffix = $portVersion
cmd:xapian_replicate$commandSuffix = $portVersion
cmd:xapian_replicate_server$commandSuffix = $portVersion
cmd:xapian_tcpsrv$commandSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -46,11 +53,11 @@ REQUIRES="
"
PROVIDES_devel="
xapian${secondaryArchSuffix} = $portVersion
xapian${secondaryArchSuffix}_devel = $portVersion
devel:libxapian$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
xapian$secondaryArchSuffix
xapian$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
@@ -72,7 +79,7 @@ defineDebugInfoPackage xapian$secondaryArchSuffix \
BUILD()
{
runConfigure ./configure
runConfigure --omit-dirs binDir ./configure --bindir $commandBinDir
make $jobArgs
}