diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-02-02 04:06:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 10:54:39 +0000 |
commit | 29c4b19e640b544c9c351aec4292a3f65b619998 (patch) | |
tree | ca35a61b15ca547e038bc2cdf6e4188f2670fcc6 /meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch | |
parent | 3619d779205464175e3c08396660ff9ee52076f9 (diff) | |
download | openembedded-core-contrib-29c4b19e640b544c9c351aec4292a3f65b619998.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
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.patch | 78 |
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 @@ +From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke.du@windriver.com> +Date: Wed, 14 Dec 2016 18:13:08 +0800 +Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross + compiling + +In configure.in, it contains the following: + + APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) + +the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4, +it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross +compiling enable. + +So it was hardcoded for cross compiling, we should detect it dynamic based on +the sysroot's glibc. We change it to the following: + + AC_CHECK_SIZEOF(off_t) + +The same for the following hardcoded types for cross compiling: + + pid_t 8 + ssize_t 8 + size_t 8 + off_t 8 + +Change the above correspondingly. + +Signed-off-by: Dengke Du <dengke.du@windriver.com> + +Upstream-Status: Pending +--- + configure.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 3b10422..a227e72 100644 +--- a/configure.in ++++ b/configure.in +@@ -1769,7 +1769,7 @@ else + socklen_t_value="int" + fi + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8) ++AC_CHECK_SIZEOF(pid_t) + + if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then + pid_t_fmt='#define APR_PID_T_FMT "hd"' +@@ -1838,7 +1838,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) + APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) + APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) ++AC_CHECK_SIZEOF(ssize_t) + + AC_MSG_CHECKING([which format to use for apr_ssize_t]) + if test -n "$ssize_t_fmt"; then +@@ -1855,7 +1855,7 @@ fi + + ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" + +-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) ++AC_CHECK_SIZEOF(size_t) + + AC_MSG_CHECKING([which format to use for apr_size_t]) + if test -n "$size_t_fmt"; then +@@ -1872,7 +1872,7 @@ fi + + size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" + +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8) ++AC_CHECK_SIZEOF(off_t) + + if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then + # Enable LFS +-- +1.8.3.1 + |