libyajl, enable/fix x86 build (#2986)

This commit is contained in:
Schrijvers Luc
2018-09-01 20:37:45 +02:00
committed by waddlesplash
parent 23ef79cc45
commit ffff377563

View File

@@ -5,19 +5,22 @@ representation to higher level code."
HOMEPAGE="https://lloyd.github.io/yajl/"
COPYRIGHT="2007-20014 Lloyd Hilaiel, and other contributors."
LICENSE="ISC"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/lloyd/yajl/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
SOURCE_DIR="yajl-$portVersion"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion="2.1.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libyajl${secondaryArchSuffix} = $portVersion
cmd:json_reformat$secondaryArchSuffix
cmd:json_verify$secondaryArchSuffix
lib:libyajl$secondaryArchSuffix = 2.1.0 compat >= 2
cmd:json_reformat
cmd:json_verify
lib:libyajl$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -25,7 +28,7 @@ REQUIRES="
PROVIDES_devel="
libyajl${secondaryArchSuffix}_devel = $portVersion
devel:libyajl$secondaryArchSuffix = 2.1.0 compat >= 2
devel:libyajl$secondaryArchSuffix = $libVersionCompat
devel:libyajl_s$secondaryArchSuffix
"
REQUIRES_devel="
@@ -63,21 +66,24 @@ INSTALL()
make install
mkdir -p $includeDir $developLibDir
mkdir -p "$includeDir" "$developLibDir" "$libDir"
mv $prefix/include/yajl $includeDir
mv $prefix/share/pkgconfig $developLibDir
mv $prefix/include/yajl "$includeDir"
mv $prefix/share/pkgconfig "$developLibDir"
rm -rf $prefix/include
rm -rf $prefix/share
prepareInstalledDevelLibs libyajl libyajl_s
if [ -n "$secondaryArchSuffix" ]; then
mv $prefix/lib/libyajl* "$libDir"/
fi
prepareInstalledDevelLibs libyajl libyajl_s
fixPkgconfig
# devel package
packageEntries devel \
$developDir
"$developDir"
}
TEST()