aboutsummaryrefslogtreecommitdiff
path: root/meta/recipes-support/apr/apr/configure_fixes.patch
blob: 05140005991b62ef76ff80edc8d8e3bef205e0a6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
Upstream-Status: Inappropriate [configuration]

Index: apr-1.3.3/configure.in
===================================================================
--- apr-1.3.3.orig/configure.in
+++ apr-1.3.3/configure.in
@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
                 create_area])
 
 APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
-AC_CHECK_FILE(/dev/zero)
-
-# Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
-if test "$ac_cv_func_mmap" = "yes" &&
-   test "$ac_cv_file__dev_zero" = "yes"; then
-    AC_MSG_CHECKING(for mmap that can map /dev/zero)
-    AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-    int main()
-    {
-        int fd;
-        void *m;
-        fd = open("/dev/zero", O_RDWR);
-        if (fd < 0) {
-            return 1;
-        }
-        m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-        if (m == (void *)-1) {  /* aka MAP_FAILED */
-            return 2;
-        }
-        if (munmap(m, sizeof(void*)) < 0) {
-            return 3;
-        }
-        return 0;
-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-
-    AC_MSG_RESULT($ac_cv_file__dev_zero)
-fi
 
 # Now we determine which one is our anonymous shmem preference.
 haveshmgetanon="0"
@@ -1518,13 +1485,14 @@ else
     bigendian=0
 fi
 
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
-#include <sys/uio.h>],struct iovec,0)
-if test "$ac_cv_sizeof_struct_iovec" = "0"; then
-    have_iovec=0
-else
-    have_iovec=1
-fi
+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
+##include <sys/uio.h>],struct iovec,0)
+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then
+#    have_iovec=0
+#else
+#    have_iovec=1
+#fi
+have_iovec=1
 
 AC_SUBST(voidp_size)
 AC_SUBST(short_value)