Updated apr to 1.4.5. Also adjusted patch so that -lnetwork gets picked up and used, this may fix some reported issues with apr

and/or subversion.
This commit is contained in:
Scott McCreary
2011-07-12 17:47:35 +00:00
parent f726af2696
commit ed876b9fca
2 changed files with 86 additions and 0 deletions

View File

@@ -0,0 +1,39 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.5.tar.gz"
CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1"
REVISION="3"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd apr-1.4.5
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd apr-1.4.5
make install
}
TEST {
cd apr-1.4.5
make test
}
LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."

View File

@@ -0,0 +1,47 @@
diff -urN apr-1.4.5/config.layout apr-1.4.5-haiku/config.layout
--- apr-1.4.5/config.layout 2004-11-24 22:51:51.056360960 +0000
+++ apr-1.4.5-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000
@@ -60,6 +60,23 @@
runtimedir: ${localstatedir}/run
</Layout>
+# Haiku Layout making use of finddir
+<Layout haiku>
+ prefix: /boot/common
+ exec_prefix: /boot/common
+ bindir: /boot/common/bin
+ sbindir: /boot/common/servers
+ libdir: /boot/common/lib
+ libexecdir: /boot/common/servers
+ mandir: /boot/common/documentation/man
+ sysconfdir: /boot/common/settings
+ datadir: /boot/common/data
+ installbuilddir: /boot/develop/build
+ includedir: /boot/common/include
+ localstatedir: /boot/common/var
+ runtimedir: ${localstatedir}/log
+</Layout>
+
# Mac OS X Server (Rhapsody)
<Layout Mac OS X Server>
prefix: /Local/Library/WebServer
diff -urN apr-1.4.5/configure.in apr-1.4.5-haiku/configure.in
--- apr-1.4.5/configure.in 2011-04-11 19:58:38.054525952 +0000
+++ apr-1.4.5-haiku/configure.in 2011-07-12 10:02:33.756023296 +0000
@@ -204,7 +204,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -676,6 +676,7 @@
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
AC_SEARCH_LIBS(socket, socket)
+ AC_SEARCH_LIBS(socket, network)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)