From 2c5135f2106842e1b5ef880a08dbd4e50c9e0d04 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 19 Mar 2016 09:13:39 +0000 Subject: siteinfo: Move apr configure cache to common-linux There are variables which are used in all target specific sitefiles. Move it to common-linux, so it can be effective for all targets. Usually they will vary based upon libc e.g. musl does not have process shared mutexes so apr_cv_process_shared_works should be no for it. For glibc though it should be yes but existing behaviour is to use 'no' so its left as it is. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/site/arm-common | 5 ----- meta/site/common-linux | 3 +++ meta/site/ix86-common | 4 ---- meta/site/mips-common | 3 --- meta/site/nios2-linux | 3 --- meta/site/powerpc32-linux | 2 -- meta/site/sh-common | 3 --- 7 files changed, 3 insertions(+), 20 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 12e5d4592a..a3c979fe05 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -8,11 +8,6 @@ ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} ac_cv_sctp=${ac_cv_sctp=no} -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} - # bash ac_cv_c_long_double=${ac_cv_c_long_double=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} diff --git a/meta/site/common-linux b/meta/site/common-linux index 448758b5f1..21fcac1c36 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -5,6 +5,9 @@ gl_cv_header_working_fcntl_h=${gl_cv_header_working_fcntl_h=yes} # apr ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} ac_cv_sizeof_pid_t=${ac_cv_sizeof_pid_t=4} +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} +apr_cv_process_shared_works=${apr_cv_process_shared_works=no} # samba samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 5cd2ce262c..135c305c0b 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -24,7 +24,6 @@ ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=4} ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8} ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no} ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} @@ -35,9 +34,6 @@ ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} ac_cv_linux_vers=${ac_cv_linux_vers=2} ac_cv_sctp=${ac_cv_sctp=no} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} - ac_cv_path_ESD_CONFIG=no lf_cv_sane_realloc=yes jm_cv_func_gettimeofday_clobber=no diff --git a/meta/site/mips-common b/meta/site/mips-common index 89d72cba47..5858dfb15b 100644 --- a/meta/site/mips-common +++ b/meta/site/mips-common @@ -30,10 +30,7 @@ ac_cv_alignof_CORBA_pointer=4 ac_cv_alignof_CORBA_struct=1 # apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} # glib glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} diff --git a/meta/site/nios2-linux b/meta/site/nios2-linux index 9e53e5db2f..434f09b10d 100644 --- a/meta/site/nios2-linux +++ b/meta/site/nios2-linux @@ -7,10 +7,7 @@ ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} ac_cv_sctp=${ac_cv_sctp=no} # apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} # bash ac_cv_c_long_double=${ac_cv_c_long_double=yes} diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux index e3929ac67d..a7744fbaf9 100644 --- a/meta/site/powerpc32-linux +++ b/meta/site/powerpc32-linux @@ -38,8 +38,6 @@ cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} # apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} diff --git a/meta/site/sh-common b/meta/site/sh-common index bde416a2cd..5cbf36a79f 100644 --- a/meta/site/sh-common +++ b/meta/site/sh-common @@ -29,9 +29,6 @@ ac_cv_ushort=${ac_cv_ushort=yes} ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -- cgit v1.2.3