trawick 2004/04/16 10:12:42
Modified: . Tag: APR_0_9_BRANCH CHANGES configure.in
build Tag: APR_0_9_BRANCH apr_threads.m4
Log:
backport this from apr 1.0-dev:
*) Provide workaround for socklen_t declaration problem with 64-bit
build on HP-UX. Stop setting a PA-RISC-specific compile option
on ia64. Look for -mt thread option, which is used with HP-UX
vendor compiler on ia64.
Alluded to by: Madhusudan Mathihalli
Revision Changes Path
No revision
No revision
1.426.2.17 +6 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.16
retrieving revision 1.426.2.17
diff -u -r1.426.2.16 -r1.426.2.17
--- CHANGES 10 Apr 2004 21:29:52 -0000 1.426.2.16
+++ CHANGES 16 Apr 2004 17:12:40 -0000 1.426.2.17
@@ -1,5 +1,11 @@
Changes with APR 0.9.5
+ *) Provide workaround for socklen_t declaration problem with 64-bit
+ build on HP-UX. Stop setting a PA-RISC-specific compile option
+ on ia64. Look for -mt thread option, which is used with HP-UX
+ vendor compiler on ia64. [Jeff Trawick, based on idea from
+ Madhusudan Mathihalli]
+
*) Return an error instead of silently failing when apr_poll() is
used with file descriptors >= FD_SETSIZE. (Unix systems with
no native poll()) [Jeff Trawick, Brad Nicholes]
1.535.2.8 +22 -4 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.535.2.7
retrieving revision 1.535.2.8
diff -u -r1.535.2.7 -r1.535.2.8
--- configure.in 7 Mar 2004 20:31:31 -0000 1.535.2.7
+++ configure.in 16 Apr 2004 17:12:40 -0000 1.535.2.8
@@ -324,10 +324,16 @@
case "$host:$CC" in
*-hp-hpux*:cc )
APR_ADDTO(CFLAGS,[-Ae +Z])
- if echo "$CFLAGS " | grep '+DA' >/dev/null; then :
- else
- APR_ADDTO(CFLAGS,[+DAportable])
- fi
+ case $host in
+ ia64-* )
+ ;;
+ * )
+ if echo "$CFLAGS " | grep '+DA' >/dev/null; then :
+ else
+ APR_ADDTO(CFLAGS,[+DAportable])
+ fi
+ ;;
+ esac
;;
powerpc-*-beos:mwcc* )
APR_SETVAR(CPP,[mwcc -E])
@@ -1151,6 +1157,18 @@
fi
if test "$ac_cv_socklen_t" = "yes"; then
socklen_t_value="socklen_t"
+ case $host in
+ *-hp-hpux*)
+ if test "$ac_cv_sizeof_long" = "8"; then
+ # 64-bit HP-UX requires 32-bit socklens in
+ # kernel, but user-space declarations say
+ # 64-bit (socklen_t == size_t == long).
+ # This will result in many compile warnings,
+ # but we're functionally busted otherwise.
+ socklen_t_value="int"
+ fi
+ ;;
+ esac
else
socklen_t_value="int"
fi
No revision
No revision
1.8.2.2 +1 -1 apr/build/apr_threads.m4
Index: apr_threads.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_threads.m4,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- apr_threads.m4 15 Nov 2003 23:42:33 -0000 1.8.2.1
+++ apr_threads.m4 16 Apr 2004 17:12:42 -0000 1.8.2.2
@@ -110,7 +110,7 @@
AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
[apr_ptc_cflags=$CFLAGS
- for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads;
do
+ for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread
-threads; do
CFLAGS=$apr_ptc_cflags
test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
APR_PTHREADS_TRY_RUN([
