diff options
Diffstat (limited to 'meta/recipes-support/apr/apr/configure_fixes.patch')
| -rw-r--r-- | meta/recipes-support/apr/apr/configure_fixes.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch new file mode 100644 index 0000000000..0514000599 --- /dev/null +++ b/meta/recipes-support/apr/apr/configure_fixes.patch | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | Index: apr-1.3.3/configure.in | ||
| 4 | =================================================================== | ||
| 5 | --- apr-1.3.3.orig/configure.in | ||
| 6 | +++ apr-1.3.3/configure.in | ||
| 7 | @@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm | ||
| 8 | create_area]) | ||
| 9 | |||
| 10 | APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) | ||
| 11 | -AC_CHECK_FILE(/dev/zero) | ||
| 12 | - | ||
| 13 | -# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. | ||
| 14 | -if test "$ac_cv_func_mmap" = "yes" && | ||
| 15 | - test "$ac_cv_file__dev_zero" = "yes"; then | ||
| 16 | - AC_MSG_CHECKING(for mmap that can map /dev/zero) | ||
| 17 | - AC_TRY_RUN([ | ||
| 18 | -#include <sys/types.h> | ||
| 19 | -#include <sys/stat.h> | ||
| 20 | -#include <fcntl.h> | ||
| 21 | -#ifdef HAVE_SYS_MMAN_H | ||
| 22 | -#include <sys/mman.h> | ||
| 23 | -#endif | ||
| 24 | - int main() | ||
| 25 | - { | ||
| 26 | - int fd; | ||
| 27 | - void *m; | ||
| 28 | - fd = open("/dev/zero", O_RDWR); | ||
| 29 | - if (fd < 0) { | ||
| 30 | - return 1; | ||
| 31 | - } | ||
| 32 | - m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); | ||
| 33 | - if (m == (void *)-1) { /* aka MAP_FAILED */ | ||
| 34 | - return 2; | ||
| 35 | - } | ||
| 36 | - if (munmap(m, sizeof(void*)) < 0) { | ||
| 37 | - return 3; | ||
| 38 | - } | ||
| 39 | - return 0; | ||
| 40 | - }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) | ||
| 41 | - | ||
| 42 | - AC_MSG_RESULT($ac_cv_file__dev_zero) | ||
| 43 | -fi | ||
| 44 | |||
| 45 | # Now we determine which one is our anonymous shmem preference. | ||
| 46 | haveshmgetanon="0" | ||
| 47 | @@ -1518,13 +1485,14 @@ else | ||
| 48 | bigendian=0 | ||
| 49 | fi | ||
| 50 | |||
| 51 | -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> | ||
| 52 | -#include <sys/uio.h>],struct iovec,0) | ||
| 53 | -if test "$ac_cv_sizeof_struct_iovec" = "0"; then | ||
| 54 | - have_iovec=0 | ||
| 55 | -else | ||
| 56 | - have_iovec=1 | ||
| 57 | -fi | ||
| 58 | +#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> | ||
| 59 | +##include <sys/uio.h>],struct iovec,0) | ||
| 60 | +#if test "$ac_cv_sizeof_struct_iovec" = "0"; then | ||
| 61 | +# have_iovec=0 | ||
| 62 | +#else | ||
| 63 | +# have_iovec=1 | ||
| 64 | +#fi | ||
| 65 | +have_iovec=1 | ||
| 66 | |||
| 67 | AC_SUBST(voidp_size) | ||
| 68 | AC_SUBST(short_value) | ||