summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-02-02 04:06:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commit561d0ce5031429e78220f1d4e206829ad3a6cd1b (patch)
tree6ec1ddfd739dce56f3cd275b4f285b78061c5e20 /meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
parent659d10a64cab58ffcf24522d17960adc66f7158d (diff)
downloadpoky-561d0ce5031429e78220f1d4e206829ad3a6cd1b.tar.gz
apr: 1.6.2 -> 1.6.3
1. Improve inappropriate patches: - Drop inappropriate configure_fixes.patch Use setting variable ac_cv_file__dev_zero and ac_cv_sizeof_struct_iovec to replace - Drop cleanup.patch Aassign variable libtool at ./buildconf executing and use 0001-build-buildcheck.sh-improve-libtool-detection.patch to replace. Submitted it to upstream. - Rename configfix.patch to 0002-apr-Remove-workdir-path-references-from-installed-ap.patch Add its original comments and author, explain why it is inappropriate - Drop upgrade-and-fix-1.5.1.patch Use 0003-Makefile.in-configure.in-support-cross-compiling.patch to replace. And submitted it to upstream. 2. Fix build path issue to improve reproducibility (From OE-Core rev: 29c4b19e640b544c9c351aec4292a3f65b619998) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch')
-rw-r--r--meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch78
1 files changed, 78 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
new file mode 100644
index 0000000000..5f5e7eac32
--- /dev/null
+++ b/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
@@ -0,0 +1,78 @@
1From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 14 Dec 2016 18:13:08 +0800
4Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross
5 compiling
6
7In configure.in, it contains the following:
8
9 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
10
11the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
12it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
13compiling enable.
14
15So it was hardcoded for cross compiling, we should detect it dynamic based on
16the sysroot's glibc. We change it to the following:
17
18 AC_CHECK_SIZEOF(off_t)
19
20The same for the following hardcoded types for cross compiling:
21
22 pid_t 8
23 ssize_t 8
24 size_t 8
25 off_t 8
26
27Change the above correspondingly.
28
29Signed-off-by: Dengke Du <dengke.du@windriver.com>
30
31Upstream-Status: Pending
32---
33 configure.in | 8 ++++----
34 1 file changed, 4 insertions(+), 4 deletions(-)
35
36diff --git a/configure.in b/configure.in
37index 3b10422..a227e72 100644
38--- a/configure.in
39+++ b/configure.in
40@@ -1769,7 +1769,7 @@ else
41 socklen_t_value="int"
42 fi
43
44-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
45+AC_CHECK_SIZEOF(pid_t)
46
47 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
48 pid_t_fmt='#define APR_PID_T_FMT "hd"'
49@@ -1838,7 +1838,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
50 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
51 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
52
53-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
54+AC_CHECK_SIZEOF(ssize_t)
55
56 AC_MSG_CHECKING([which format to use for apr_ssize_t])
57 if test -n "$ssize_t_fmt"; then
58@@ -1855,7 +1855,7 @@ fi
59
60 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
61
62-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
63+AC_CHECK_SIZEOF(size_t)
64
65 AC_MSG_CHECKING([which format to use for apr_size_t])
66 if test -n "$size_t_fmt"; then
67@@ -1872,7 +1872,7 @@ fi
68
69 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
70
71-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
72+AC_CHECK_SIZEOF(off_t)
73
74 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
75 # Enable LFS
76--
771.8.3.1
78