diff options
Diffstat (limited to 'meta/recipes-support/apr/apr_1.7.0.bb')
-rw-r--r-- | meta/recipes-support/apr/apr_1.7.0.bb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index b9d3e356da..5e62e5683f 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb | |||
@@ -25,6 +25,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
25 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 25 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
26 | file://autoconf270.patch \ | 26 | file://autoconf270.patch \ |
27 | file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \ | 27 | file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \ |
28 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ | ||
28 | file://CVE-2021-35940.patch \ | 29 | file://CVE-2021-35940.patch \ |
29 | " | 30 | " |
30 | 31 | ||
@@ -37,12 +38,22 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | |||
37 | 38 | ||
38 | # Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 | 39 | # Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 |
39 | CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" | 40 | CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" |
40 | 41 | # Enable largefile | |
42 | CACHED_CONFIGUREVARS += "apr_cv_use_lfs64=yes" | ||
43 | # Additional AC_TRY_RUN tests which will need to be cached for cross compile | ||
44 | CACHED_CONFIGUREVARS += "apr_cv_epoll=yes epoll_create1=yes apr_cv_sock_cloexec=yes \ | ||
45 | ac_cv_struct_rlimit=yes \ | ||
46 | ac_cv_func_sem_open=yes \ | ||
47 | apr_cv_process_shared_works=yes \ | ||
48 | apr_cv_mutex_robust_shared=yes \ | ||
49 | " | ||
41 | # Also suppress trying to use sctp. | 50 | # Also suppress trying to use sctp. |
42 | # | 51 | # |
43 | CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" | 52 | CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" |
44 | 53 | ||
45 | CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" | 54 | # ac_cv_sizeof_struct_iovec is deduced using runtime check which will fail during cross-compile |
55 | CACHED_CONFIGUREVARS += "${@['ac_cv_sizeof_struct_iovec=16','ac_cv_sizeof_struct_iovec=8'][d.getVar('SITEINFO_BITS') != '32']}" | ||
56 | |||
46 | CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" | 57 | CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" |
47 | 58 | ||
48 | CACHED_CONFIGUREVARS:append:libc-musl = " ac_cv_strerror_r_rc_int=yes" | 59 | CACHED_CONFIGUREVARS:append:libc-musl = " ac_cv_strerror_r_rc_int=yes" |