haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop old apr recipes and patches

Browse Source
This commit is contained in:
Oliver Tappe
2013-08-25 13:15:13 +02:00
parent 3eec7a1b90
commit a50239f369
11 changed files with 0 additions and 6684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
dev-libs/apr/apr-1.4.2.recipe
View File

@@ -1,90 +0,0 @@
SUMMARY="Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."
REVISION="5"
ARCHITECTURES="x86_gcc2 ?x86"
PROVIDES="
apr = $portVersion compat >= 1
lib:libapr = $portVersion compat >= 1
lib:libapr_1 = $portVersion compat >= 1
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
"
SOURCE_DIR="$portVersionedName"
BUILD()
{
libtoolize --force --copy --install
touch libtool.m4
aclocal -I build
autoconf
./configure $configureDirArgs
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
ln -sfn $sourceDir/libtool /libtool
make
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libapr-1
fixPkgconfig
}
TEST()
{
make test
}
# ----- source package -------------------------------------------------------
PROVIDES_source="apr_source = $portVersion compat = $portVersion"
DESCRIPTION="
The mission of the Apache Portable Runtime (APR) project is to create
and maintain software libraries that provide a predictable and consistent
interface to underlying platform-specific implementations. The primary
goal is to provide an API to which software developers may code and be
assured of predictable if not identical behaviour regardless of the
platform on which their software is built, relieving them of the need to
code special-case conditions to work around or take advantage of
platform-specific deficiencies or features.
To give a brief overview, the primary core subsystems of APR 1.x include
the following:
- atomic operations
- dynamic Shared Object loading
- file I/O
- locks (mutexes, condition variables, etc)
- memory management (high performance allocators)
- memory-mapped files
- multicast Sockets
- network I/O
- shared memory
- thread and Process management
- various data structures (tables, hashes, priority queues, etc)
"

185
dev-libs/apr/patches/apr-0.9.x-haiku.diff
View File

@@ -1,185 +0,0 @@
diff -urN apr-0.9.17-orig/build/apr_hints.m4 apr-0.9.17/build/apr_hints.m4
--- apr-0.9.17-orig/build/apr_hints.m4 2006-03-16 09:41:51.000000000 +0000
+++ apr-0.9.17/build/apr_hints.m4 2008-05-13 22:10:51.000000000 +0000
@@ -390,6 +390,12 @@
APR_ADDTO(CPPFLAGS, [-DCYGWIN])
APR_ADDTO(LIBS, [-lcrypt])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
diff -urN apr-0.9.17-orig/configure.in apr-0.9.17/configure.in
--- apr-0.9.17-orig/configure.in 2007-11-03 14:18:38.000000000 +0000
+++ apr-0.9.17/configure.in 2008-05-13 22:10:51.000000000 +0000
@@ -219,7 +219,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -434,6 +434,13 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ APR_ADDTO(CPPFLAGS,-I/boot/develop/headers/bsd)
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -656,6 +663,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -671,10 +682,6 @@
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS_ANON,
- [BeOS areas])])
case $host in
*linux* )
# Linux has problems with MM_SHMT_MMANON even though it reports
@@ -722,6 +729,9 @@
havebeosarea="0"
haveos2shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -735,9 +745,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
@@ -1270,7 +1277,7 @@
ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "lu"'
;;
- *beos*)
+ *beos*|*haiku*)
ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "ld"'
;;
diff -urN apr-0.9.17-orig/test/testoc.c apr-0.9.17/test/testoc.c
--- apr-0.9.17-orig/test/testoc.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testoc.c 2008-05-13 22:10:51.000000000 +0000
@@ -78,6 +78,9 @@
rv = apr_procattr_create(&procattr, p);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE,
APR_NO_PIPE);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
diff -urN apr-0.9.17-orig/test/testpipe.c apr-0.9.17/test/testpipe.c
--- apr-0.9.17-orig/test/testpipe.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpipe.c 2008-05-13 22:10:51.000000000 +0000
@@ -152,6 +152,9 @@
rv = apr_procattr_create(&procattr, p);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK,
APR_CHILD_BLOCK);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
diff -urN apr-0.9.17-orig/test/testpoll.c apr-0.9.17/test/testpoll.c
--- apr-0.9.17-orig/test/testpoll.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpoll.c 2008-05-13 22:10:51.000000000 +0000
@@ -197,6 +197,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -212,6 +214,8 @@
recv_msg(s, 1, p, tc);
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 1, tc);
@@ -318,6 +322,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 1, num);
@@ -348,6 +353,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 2, num);
@@ -380,6 +386,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 1, num);
diff -urN apr-0.9.17-orig/test/testproc.c apr-0.9.17/test/testproc.c
--- apr-0.9.17-orig/test/testproc.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testproc.c 2008-05-13 22:10:51.000000000 +0000
@@ -53,7 +53,7 @@
rv = apr_procattr_dir_set(attr, "data");
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
args[0] = "proc_child" EXTENSION;
@@ -129,7 +129,7 @@
CuAssertIntEquals(tc, APR_SUCCESS, rv);
rv = apr_procattr_dir_set(attr, "data");
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
args[0] = "proc_child";

2750
dev-libs/apr/patches/apr-0.9.x.diff
View File

File diff suppressed because it is too large Load Diff

2869
dev-libs/apr/patches/apr-1.0.1.diff
View File

File diff suppressed because it is too large Load Diff

23
dev-libs/apr/patches/apr-1.2.x.diff
View File

@@ -1,23 +0,0 @@
Index: Makefile.in
===================================================================
--- Makefile.in (revision 619048)
+++ Makefile.in (working copy)
@@ -18,7 +18,7 @@
INCDIR=./include
OSDIR=$(top_srcdir)/include/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
#
# Macros for target determination
Index: build/gen-build.py
===================================================================
--- build/gen-build.py (revision 619048)
+++ build/gen-build.py (working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#

201
dev-libs/apr/patches/apr-1.3.3.patch
View File

@@ -1,201 +0,0 @@
diff -urN apr-1.3.3/build/apr_hints.m4 apr-1.3.3-haiku/build/apr_hints.m4
--- apr-1.3.3/build/apr_hints.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_hints.m4 2009-04-28 02:01:57.000000000 +0000
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -453,6 +453,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -463,7 +469,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.3/build/apr_network.m4 apr-1.3.3-haiku/build/apr_network.m4
--- apr-1.3.3/build/apr_network.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_network.m4 2009-04-27 06:00:26.000000000 +0000
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.3/build/apr_threads.m4 apr-1.3.3-haiku/build/apr_threads.m4
--- apr-1.3.3/build/apr_threads.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_threads.m4 2009-04-27 05:51:44.000000000 +0000
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.3/configure.in apr-1.3.3-haiku/configure.in
--- apr-1.3.3/configure.in 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/configure.in 2009-04-28 02:02:02.000000000 +0000
@@ -244,7 +244,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -479,6 +479,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -833,6 +840,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -904,6 +915,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -917,9 +931,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.3/test/testpoll.c apr-1.3.3-haiku/test/testpoll.c
--- apr-1.3.3/test/testpoll.c 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/test/testpoll.c 2009-04-28 02:02:28.000000000 +0000
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

219
dev-libs/apr/patches/apr-1.3.8.patch
View File

@@ -1,219 +0,0 @@
diff -urN apr-1.3.8/build/apr_hints.m4 apr-1.3.8-haiku/build/apr_hints.m4
--- apr-1.3.8/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -454,6 +454,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -464,7 +470,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.8/build/apr_network.m4 apr-1.3.8-haiku/build/apr_network.m4
--- apr-1.3.8/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.8/build/apr_threads.m4 apr-1.3.8-haiku/build/apr_threads.m4
--- apr-1.3.8/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.8/build/gen-build.py apr-1.3.8-haiku/build/gen-build.py
--- apr-1.3.8/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800
+++ apr-1.3.8-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#
diff -urN apr-1.3.8/configure.in apr-1.3.8-haiku/configure.in
--- apr-1.3.8/configure.in 2009-07-17 16:14:25.000000000 -0700
+++ apr-1.3.8-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700
@@ -135,7 +135,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)
@@ -248,7 +248,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -486,6 +486,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -962,6 +968,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -1033,6 +1043,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -1046,9 +1059,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.8/test/testpoll.c apr-1.3.8-haiku/test/testpoll.c
--- apr-1.3.8/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700
+++ apr-1.3.8-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

219
dev-libs/apr/patches/apr-1.3.9.patch
View File

@@ -1,219 +0,0 @@
diff -urN apr-1.3.9/build/apr_hints.m4 apr-1.3.9-haiku/build/apr_hints.m4
--- apr-1.3.9/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -454,6 +454,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -464,7 +470,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.9/build/apr_network.m4 apr-1.3.9-haiku/build/apr_network.m4
--- apr-1.3.9/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.9/build/apr_threads.m4 apr-1.3.9-haiku/build/apr_threads.m4
--- apr-1.3.9/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.9/build/gen-build.py apr-1.3.9-haiku/build/gen-build.py
--- apr-1.3.9/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800
+++ apr-1.3.9-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#
diff -urN apr-1.3.9/configure.in apr-1.3.9-haiku/configure.in
--- apr-1.3.9/configure.in 2009-07-17 16:14:25.000000000 -0700
+++ apr-1.3.9-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700
@@ -135,7 +135,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)
@@ -248,7 +248,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -486,6 +486,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -962,6 +968,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -1033,6 +1043,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -1046,9 +1059,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.9/test/testpoll.c apr-1.3.9-haiku/test/testpoll.c
--- apr-1.3.9/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700
+++ apr-1.3.9-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

39
dev-libs/apr/patches/apr-1.4.2.patch
View File

@@ -1,39 +0,0 @@
diff -urN apr-1.4.2/config.layout apr-1.4.2-haiku/config.layout
--- apr-1.4.2/config.layout 2004-11-24 22:51:51.065798144 +0000
+++ apr-1.4.2-haiku/config.layout 2011-03-24 11:36:30.742653952 +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.2/configure.in apr-1.4.2-haiku/configure.in
--- apr-1.4.2/configure.in 2009-11-16 07:45:28.064225280 +0000
+++ apr-1.4.2-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000
@@ -143,7 +143,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)

39
dev-libs/apr/patches/apr-1.4.4.patch
View File

@@ -1,39 +0,0 @@
diff -urN apr-1.4.4/config.layout apr-1.4.4-haiku/config.layout
--- apr-1.4.4/config.layout 2004-11-24 22:51:51.065798144 +0000
+++ apr-1.4.4-haiku/config.layout 2011-03-24 11:36:30.742653952 +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.4/configure.in apr-1.4.4-haiku/configure.in
--- apr-1.4.4/configure.in 2009-11-16 07:45:28.064225280 +0000
+++ apr-1.4.4-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000
@@ -143,7 +143,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)

50
dev-libs/apr/patches/apr-1.4.5.patch
View File

@@ -1,50 +0,0 @@
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 12:58:38.043253760 -0700
+++ apr-1.4.5-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700
@@ -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)
@@ -673,9 +673,9 @@
ac_cv_func_CreateFileMapping=yes
;;
*)
+ AC_SEARCH_LIBS(socket, socket network)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl)
- AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(crypt, crypt ufc)
AC_CHECK_LIB(truerand, main)
AC_SEARCH_LIBS(modf, m)