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/configure_fixes.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/configure_fixes.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/configure_fixes.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch deleted file mode 100644 index 0514000599..0000000000 --- a/meta/recipes-support/apr/apr/configure_fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -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) |