apr-util: Update from trunk and update for hpkg building

Ignore the patch from trunk, though, since it doesn't seem useful.
This commit is contained in:
Ingo Weinhold
2013-03-29 00:47:49 +00:00
parent 607c7b53a9
commit 4f80c5f0c8

View File

@@ -1,47 +1,66 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.reverse.net/pub/apache//apr/apr-util-1.3.10.tar.gz"
SUMMARY="Apache Portable Runtime Utility Library"
DESCRIPTION="Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
REVISION="1"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.3.9"
PROVIDES="apr-util = $portVersion compat >= 1
lib:libaprutil = $portVersion compat >= 1
lib:libaprutil-1 = $portVersion compat >= 1"
REQUIRES="haiku >= $haikuVersion
apr >= 1.3.9
expat >= 2.0"
BUILD_REQUIRES="cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make"
BUILD_PREREQUIRES="haiku-devel >= $haikuVersion"
SOURCE_DIR="$portVersionedName"
# TODO: The hard-coded reference to the apr work directory isn't good at all.
# We should declare a build dependency on the APR sources instead.
BUILD {
cd apr-util-1.3.10
aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
aprInstallDir=$aprUtilPackageLinksDir/apr
# We need the APR sources to build APR-Util.
haikuporter -b -y apr-1.4.2
aprSourceDir=$(haikuporter -t)/dev-libs/apr/work/apr-1.4.2
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.2
echo `AC_CONFIG_MACRO_DIR([m4])` >> configure.in
echo `AM_INIT_AUTOMAKE` >> configure.in
cp /boot/common/share/aclocal/libtool.m4 m4
cp /boot/common/share/aclocal/ltoptions.m4 m4
cp /boot/common/share/aclocal/ltversion.m4 m4
cp /boot/common/share/aclocal/ltsugar.m4 m4
cp /boot/common/share/aclocal/lt~obsolete.m4 m4
libtoolize --force --copy --install
aclocal -I m4
autoconf --force
APRDIR=`haikuporter -t`
buildconf --with-apr=${APRDIR}/dev-libs/apr/work/apr-1.4.2
haikuporter -b -y apr-1.4.2
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
cp /boot/common/share/aclocal/libtool.m4 m4
cp /boot/common/share/aclocal/ltoptions.m4 m4
cp /boot/common/share/aclocal/ltversion.m4 m4
cp /boot/common/share/aclocal/ltsugar.m4 m4
cp /boot/common/share/aclocal/lt~obsolete.m4 m4
libtoolize --force --copy --install
aclocal -I m4
echo 'AM_INIT_AUTOMAKE' >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
./configure --prefix=/boot/common --with-apr=/boot/common/bin/apr-1-config
sed -i 's/\/usr\/bin\/env/\/bin\/env/' $aprSourceDir/build/gen-build.py
buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \
--prefix=$prefix
ln -sf $(which libtool) ./libtool
./configure $configureDirArgs \
--with-apr=$aprInstallDir/bin/apr-1-config
make
}
INSTALL {
cd apr-util-1.3.10
make install
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."