diff options
Diffstat (limited to 'comms/asterisk18/patches/patch-aq')
| -rw-r--r-- | comms/asterisk18/patches/patch-aq | 159 |
1 files changed, 144 insertions, 15 deletions
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq index ae0cfbfffc3..6de1075f7e6 100644 --- a/comms/asterisk18/patches/patch-aq +++ b/comms/asterisk18/patches/patch-aq @@ -1,31 +1,160 @@ -$NetBSD: patch-aq,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $ +$NetBSD: patch-aq,v 1.1.1.1.2.1 2011/01/25 15:28:55 tron Exp $ ---- configure.orig 2010-11-09 20:33:05.000000000 +0000 +--- configure.orig 2011-01-12 16:52:31.000000000 +0000 +++ configure -@@ -16365,6 +16365,17 @@ fi +@@ -22973,6 +22973,146 @@ fi -+ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_atomic_h" = x""yes; then : ++if test "${ac_cv_header_sys_atomic_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/atomic.h" >&5 ++echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_atomic_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5 ++echo $ECHO_N "checking sys/atomic.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <sys/atomic.h> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5 ++echo $ECHO_N "checking sys/atomic.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/atomic.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ------------------------------------------ ## ++## Report this to https://issues.asterisk.org ## ++## ------------------------------------------ ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/atomic.h" >&5 ++echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_atomic_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_atomic_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_atomic_h = yes; then + +cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_ATOMIC_H 1 ++#define HAVE_OS_ATOMIC_H 1 +_ACEOF + +fi + + + - # The cast to long int works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -@@ -17346,6 +17357,8 @@ $as_echo_n "checking if \"struct ifaddrs - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { echo "$as_me:$LINENO: checking for int" >&5 + echo $ECHO_N "checking for int... $ECHO_C" >&6; } + if test "${ac_cv_type_int+set}" = set; then +@@ -27494,6 +27634,8 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -+ #include <sys/types.h> -+ #include <sys/socket.h> - #include <ifaddrs.h> ++#include <sys/types.h> ++#include <sys/socket.h> + #include <ifaddrs.h> int main () |