mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -1,20 +0,0 @@
|
||||
DESCRIPTION="apr - Apache Portable Runtime Library"
|
||||
HOMEPAGE="http://apr.apache.org/"
|
||||
SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd apr-1.3.8
|
||||
libtoolize --force --copy --install
|
||||
buildconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd apr-1.3.8
|
||||
make install
|
||||
}
|
||||
LICENSE="Apache v2"
|
||||
COPYRIGHT="2010 The Apache Software Foundation."
|
||||
@@ -1,21 +0,0 @@
|
||||
DESCRIPTION="apr - Apache Portable Runtime Library"
|
||||
HOMEPAGE="http://apr.apache.org/"
|
||||
SRC_URI="http://www.apache.org/dist/apr/apr-1.3.9.tar.gz"
|
||||
CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd apr-1.3.9
|
||||
libtoolize --force --copy --install
|
||||
buildconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd apr-1.3.9
|
||||
make install
|
||||
}
|
||||
LICENSE="Apache v2"
|
||||
COPYRIGHT="2010 The Apache Software Foundation."
|
||||
@@ -1,39 +0,0 @@
|
||||
DESCRIPTION="apr - 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"
|
||||
REVISION="3"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd apr-1.4.2
|
||||
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.2
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd apr-1.4.2
|
||||
make test
|
||||
}
|
||||
|
||||
LICENSE="Apache v2"
|
||||
COPYRIGHT="2010 The Apache Software Foundation."
|
||||
@@ -1,39 +0,0 @@
|
||||
DESCRIPTION="apr - Apache Portable Runtime Library"
|
||||
HOMEPAGE="http://apr.apache.org/"
|
||||
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.4.tar.gz"
|
||||
CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf"
|
||||
REVISION="3"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd apr-1.4.4
|
||||
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.4
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd apr-1.4.4
|
||||
make test
|
||||
}
|
||||
|
||||
LICENSE="Apache v2"
|
||||
COPYRIGHT="2010 The Apache Software Foundation."
|
||||
@@ -1,39 +0,0 @@
|
||||
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="4"
|
||||
STATUS_HAIKU="stable"
|
||||
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."
|
||||
@@ -1,39 +0,0 @@
|
||||
DESCRIPTION="apr - Apache Portable Runtime Library"
|
||||
HOMEPAGE="http://apr.apache.org/"
|
||||
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
|
||||
CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
|
||||
REVISION="4"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd apr-1.4.6
|
||||
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.6
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd apr-1.4.6
|
||||
make test
|
||||
}
|
||||
|
||||
LICENSE="Apache v2"
|
||||
COPYRIGHT="2012 The Apache Software Foundation."
|
||||
111
dev-libs/apr/apr-1.4.6.recipe
Normal file
111
dev-libs/apr/apr-1.4.6.recipe
Normal file
@@ -0,0 +1,111 @@
|
||||
SUMMARY="Apache Portable Runtime Library"
|
||||
HOMEPAGE="http://apr.apache.org/"
|
||||
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
|
||||
COPYRIGHT="2012 The Apache Software Foundation."
|
||||
LICENSE="Apache v2"
|
||||
CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
|
||||
REVISION="7"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PATCHES="apr-1.4.6.patch"
|
||||
|
||||
PROVIDES="
|
||||
apr = $portVersion compat >= 1
|
||||
lib:libapr_1 = 0.4.6 compat >= 0
|
||||
"
|
||||
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 -fci
|
||||
touch libtool.m4
|
||||
aclocal -I build
|
||||
autoconf
|
||||
runConfigure ./configure \
|
||||
--with-installbuilddir=$prefix/data/apr
|
||||
|
||||
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
|
||||
ln -sfn $sourceDir/libtool /libtool
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLibs libapr-1
|
||||
fixPkgconfig
|
||||
|
||||
# fix apr-1-config
|
||||
fixDevelopLibDirReferences $binDir/apr-1-config
|
||||
|
||||
# remove superfluous .exp file
|
||||
rm $libDir/apr.exp
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$binDir \
|
||||
$dataDir \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make test
|
||||
}
|
||||
|
||||
# ----- description ----------------------------------------------------------
|
||||
|
||||
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)
|
||||
"
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
apr_devel = portVersion compat >= 1
|
||||
cmd:apr_1_config = portVersion compat >= 1
|
||||
devel:libapr_1 = 0.4.6 compat >= 0
|
||||
"
|
||||
REQUIRES_devel="
|
||||
apr == $portVersion base
|
||||
"
|
||||
@@ -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";
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
#
|
||||
@@ -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);
|
||||
@@ -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);
|
||||
@@ -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);
|
||||
@@ -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)
|
||||
Reference in New Issue
Block a user