diff options
| -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 | |||
| 23 | 23 | ||
| 24 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | 24 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" |
| 25 | 25 | ||
| 26 | # Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 | ||
| 27 | CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" | ||
| 28 | |||
| 26 | do_configure_prepend() { | 29 | do_configure_prepend() { |
| 27 | cd ${S} | 30 | cd ${S} |
| 28 | ./buildconf | 31 | ./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} | |||
| 203 | apr_cv_epoll=${apr_cv_epoll=yes} | 203 | apr_cv_epoll=${apr_cv_epoll=yes} |
| 204 | apr_cv_pthreads_cflags=${apr_cv_pthreads_cflags=-pthread} | 204 | apr_cv_pthreads_cflags=${apr_cv_pthreads_cflags=-pthread} |
| 205 | apr_cv_pthreads_lib=${apr_cv_pthreads_lib=-lpthread} | 205 | apr_cv_pthreads_lib=${apr_cv_pthreads_lib=-lpthread} |
| 206 | apr_cv_mutex_recursive=${apr_cv_mutex_recursive=yes} | ||
| 207 | ac_cv_func_mmap=${ac_cv_func_mmap=yes} | 206 | ac_cv_func_mmap=${ac_cv_func_mmap=yes} |
| 208 | ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} | 207 | ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} |
| 209 | ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} | 208 | ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} |
