Fix dependencies following removal of common dir

* This changed package mounting rules so we have to be stricter in what
the packages depend on.
 * Also make sqlite3.8 recipe hybrid-compatible.
This commit is contained in:
Adrien Destugues
2013-10-10 16:56:18 +02:00
parent 0a0c6e28e6
commit 562057d427
2 changed files with 49 additions and 14 deletions

View File

@@ -1,27 +1,43 @@
SUMMARY="A SQL Database Engine in a C Library"
DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine."
SUMMARY="An SQL Database Engine in a C Library"
DESCRIPTION="
SQLite is a software library that implements a self-contained,
serverless, zero-configuration, transactional SQL database engine.
SQLite is the most widely deployed SQL database engine in the world.
The source code for SQLite is in the public domain.
"
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz"
CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386"
REVISION="1"
ARCHITECTURES="?x86_gcc2 ?x86"
ARCHITECTURES="x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
LICENSE="SQLite"
COPYRIGHT="Public Domain"
PROVIDES="sqlite = $portVersion compat >= 3
cmd:sqlite3 = $portVersion compat >= 3
lib:libsqlite = $portVersion compat >= 3
devel:libsqlite3 = $portVersion compat >= 3
lib:libsqlite3 = $portVersion compat >= 3
PROVIDES="
sqlite$secondaryArchSuffix = $portVersion compat >= 3
lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:sqlite3 = $portVersion compat >= 3
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
REQUIRES="haiku >= $haikuVersion"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc
cmd:ld
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
@@ -44,7 +60,24 @@ INSTALL()
prepareInstalledDevelLib libsqlite3
fixPkgconfig
# devel package
packageEntries devel \
$developDir
# Remove stuff we don't need in the secondary architecture base package.
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $binDir
rm -rf $documentationDir
fi
}
LICENSE="SQLite"
COPYRIGHT="Public Domain"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
sqlite${secondaryArchSuffix}_devel = $portVersion
devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
"
REQUIRES_devel="
sqlite$secondaryArchSuffix == $portVersion base
"