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

Merged in TheNavigator/haikuports (pull request #337)

Browse Source 
Fixed apr_util-1.5.4 recipe for x86 build
This commit is contained in:
François Revol
2014-12-14 00:16:46 +01:00
parent 6e20105bf2 7f69e02634
commit b446faf1f4
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dev-libs/apr_util/apr_util-1.5.4.recipe
View File

@@ -16,30 +16,31 @@ LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PATCHES="apr_util-1.5.3.patch"
PROVIDES="
apr_util = $portVersion compat >= 1
lib:libaprutil_1 = 0.5.4 compat >= 0
apr_util$secondaryArchSuffix = $portVersion compat >= 1
lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
lib:libapr_1
lib:libexpat
lib:libiconv
haiku$secondaryArchSuffix >= $haikuVersion
lib:libapr_1$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libapr_1 >= 0.5.0
devel:libexpat
devel:libiconv
devel:libapr_1$secondaryArchSuffix >= 0.5.0
devel:libexpat$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:gcc
cmd:gcc$secondaryArchSuffix
cmd:ld
cmd:libtoolize
cmd:make
@@ -54,8 +55,7 @@ PATCH()
BUILD()
{
aprInstallDir=$portPackageLinksDir/lib~libapr_1
expatInstallDir=$portPackageLinksDir/lib~libexpat
expatInstallDir=$portPackageLinksDir/lib~libexpat$secondaryArchSuffix
rm -rf aclocal.m4
mkdir -p m4
@@ -77,7 +77,7 @@ BUILD()
ln -sfn $sourceDir/libtool /libtool
runConfigure ./configure \
--with-apr=$aprInstallDir \
--with-apr=/$relativeBinDir \
--with-expat=$expatInstallDir
make $jobArgs
}
@@ -108,10 +108,10 @@ INSTALL()
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
apr_util_devel = portVersion compat >= 1
cmd:apu_1_config = $portVersion compat >= 1
devel:libaprutil_1 = 0.5.4 compat >= 0
apr_util_devel$secondaryArchSuffix = portVersion compat >= 1
cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
"
REQUIRES_devel="
apr_util == $portVersion base
apr_util$secondaryArchSuffix == $portVersion base
"