| 1 |
vapier 14/01/22 22:27:42 |
| 2 |
|
| 3 |
Added: apr-1.5.0-cross-types.patch |
| 4 |
Log: |
| 5 |
Fix cross-compiling. |
| 6 |
|
| 7 |
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/apr/files/apr-1.5.0-cross-types.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/files/apr-1.5.0-cross-types.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/files/apr-1.5.0-cross-types.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: apr-1.5.0-cross-types.patch |
| 16 |
=================================================================== |
| 17 |
use standard AC_CHECK_SIZEOF as it supports non-builtin types and |
| 18 |
supports cross-compiling sanely |
| 19 |
|
| 20 |
https://issues.apache.org/bugzilla/show_bug.cgi?id=56053 |
| 21 |
|
| 22 |
--- a/configure.in |
| 23 |
+++ b/configure.in |
| 24 |
@@ -1684,7 +1684,7 @@ else |
| 25 |
socklen_t_value="int" |
| 26 |
fi |
| 27 |
|
| 28 |
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) |
| 29 |
+AC_CHECK_SIZEOF(pid_t) |
| 30 |
|
| 31 |
if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then |
| 32 |
pid_t_fmt='#define APR_PID_T_FMT "hd"' |
| 33 |
@@ -1753,7 +1753,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) |
| 34 |
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) |
| 35 |
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) |
| 36 |
|
| 37 |
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) |
| 38 |
+AC_CHECK_SIZEOF(ssize_t) |
| 39 |
|
| 40 |
AC_MSG_CHECKING([which format to use for apr_ssize_t]) |
| 41 |
if test -n "$ssize_t_fmt"; then |
| 42 |
@@ -1770,7 +1770,7 @@ fi |
| 43 |
|
| 44 |
ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" |
| 45 |
|
| 46 |
-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) |
| 47 |
+AC_CHECK_SIZEOF(size_t) |
| 48 |
|
| 49 |
AC_MSG_CHECKING([which format to use for apr_size_t]) |
| 50 |
if test -n "$size_t_fmt"; then |
| 51 |
@@ -1787,7 +1787,7 @@ fi |
| 52 |
|
| 53 |
size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" |
| 54 |
|
| 55 |
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) |
| 56 |
+AC_CHECK_SIZEOF(off_t) |
| 57 |
|
| 58 |
if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then |
| 59 |
# Enable LFS |
| 60 |
@@ -1866,7 +1866,7 @@ case $host in |
| 61 |
;; |
| 62 |
*) |
| 63 |
ino_t_value=ino_t |
| 64 |
- APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long) |
| 65 |
+ AC_CHECK_SIZEOF(ino_t) |
| 66 |
if test $ac_cv_sizeof_ino_t = 4; then |
| 67 |
if test $ac_cv_sizeof_long = 4; then |
| 68 |
ino_t_value="unsigned long" |
| 69 |
@@ -1886,8 +1886,8 @@ else |
| 70 |
bigendian=0 |
| 71 |
fi |
| 72 |
|
| 73 |
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> |
| 74 |
-#include <sys/uio.h>],struct iovec,0) |
| 75 |
+AC_CHECK_SIZEOF(struct iovec,,[AC_INCLUDES_DEFAULT |
| 76 |
+#include <sys/uio.h>]) |
| 77 |
if test "$ac_cv_sizeof_struct_iovec" = "0"; then |
| 78 |
have_iovec=0 |
| 79 |
else |
Archives