diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/apr/apr_1.4.6.bb | 3 | ||||
| -rw-r--r-- | meta/site/powerpc32-linux | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.6.bb index 77dffee12c..fb87d68c9f 100644 --- a/meta/recipes-support/apr/apr_1.4.6.bb +++ b/meta/recipes-support/apr/apr_1.4.6.bb @@ -23,6 +23,9 @@ inherit autotools lib_package binconfig multilib_header OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" +# Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 +CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" + do_configure_prepend() { cd ${S} ./buildconf diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux index 251bffe1ef..e3929ac67d 100644 --- a/meta/site/powerpc32-linux +++ b/meta/site/powerpc32-linux @@ -203,7 +203,6 @@ apr_cv_use_lfs64=${apr_cv_use_lfs64=yes} apr_cv_epoll=${apr_cv_epoll=yes} apr_cv_pthreads_cflags=${apr_cv_pthreads_cflags=-pthread} apr_cv_pthreads_lib=${apr_cv_pthreads_lib=-lpthread} -apr_cv_mutex_recursive=${apr_cv_mutex_recursive=yes} ac_cv_func_mmap=${ac_cv_func_mmap=yes} ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} |