author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Wed, 25 Apr 2012 10:23:57 -0700 | |
changeset 798 | fad7814b8b14 |
parent 203 | 887f23af6934 |
permissions | -rw-r--r-- |
203
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
--- build/apr_hints.m4.orig Tue Jun 26 16:47:46 2007 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
+++ build/apr_hints.m4 Fri Feb 8 04:54:31 2008 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
@@ -243,8 +243,19 @@ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
;; |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
*-solaris2*) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'` |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
- APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
- APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+ APR_SETVAR(THREADED_CPPFLAGS, []) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+ if test "$enable_threads" != "no"; then |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+ APR_ADDTO(THREADED_CPPFLAGS, [-D_POSIX_PTHREAD_SEMANTICS]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+ dnl If using native compiler, use recommended -mt option to ensure |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ dnl proper preprocessor definitions and library link order. |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ if $CC -flags 2>&1 | grep '^-mt.*multi-threaded' > /dev/null 2>&1; then |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ APR_ADDTO(THREADED_CPPFLAGS, [-mt]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ else |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ APR_ADDTO(THREADED_CPPFLAGS, [-D_REENTRANT]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ fi |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ fi |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS $THREADED_CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ APR_SETIFNULL(apr_lock_method, [USE_PROC_PTHREAD_SERIALIZE]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
# readdir64_r error handling seems broken on Solaris (at least |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
# up till 2.8) -- it will return -1 at end-of-directory. |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
APR_SETIFNULL(ac_cv_func_readdir64_r, [no]) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
--- configure.in.orig Sat Nov 3 07:13:08 2007 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
+++ configure.in Fri Feb 8 04:54:31 2008 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
@@ -107,7 +107,7 @@ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
dnl Enable the layout handling code, then reparse the prefix-style |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
dnl arguments due to autoconf being a PITA. |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
-APR_ENABLE_LAYOUT(apr) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+APR_ENABLE_LAYOUT(Solaris-Apache2) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
APR_PARSE_ARGUMENTS |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
dnl Set optional CC hints here in case autoconf makes an inappropriate choice. |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
@@ -1469,6 +1469,11 @@ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
socklen_t_value="int" |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
fi |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
;; |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
+ *-solaris2*) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
+ # sendfile64 doesn't work correctly with Apache (CR 6452545) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
+ # (when LARGEFILE_SOURCE && _FILE_OFFSET_BITS == 64 are used) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
+ sendfile="0" |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
+ ;; |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
esac |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
else |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
socklen_t_value="int" |