summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-12 16:16:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 17:55:11 +0100
commit29ec9c5f32d6c841c8994a8f32a97b166711cc12 (patch)
tree788533abb4f2112c4fde5cfa2de5cd18ac050f6a /meta/recipes-support/apr
parent0c3d4bb2d8fb7327eed9aa223cd3f33d7303f0fb (diff)
downloadpoky-29ec9c5f32d6c841c8994a8f32a97b166711cc12.tar.gz
apr: upgrade 1.6.5 -> 1.7.0
(From OE-Core rev: 6cbdecf8236153db202d938d0ab8a546852bd564) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r--meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch26
-rw-r--r--meta/recipes-support/apr/apr_1.7.0.bb (renamed from meta/recipes-support/apr/apr_1.6.5.bb)4
2 files changed, 14 insertions, 16 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
index 5f5e7eac32..d1a2ebe881 100644
--- 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
@@ -1,7 +1,7 @@
1From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 1From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Wed, 14 Dec 2016 18:13:08 +0800 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 4Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross
5 compiling 5 compiling
6 6
7In configure.in, it contains the following: 7In configure.in, it contains the following:
@@ -29,15 +29,16 @@ Change the above correspondingly.
29Signed-off-by: Dengke Du <dengke.du@windriver.com> 29Signed-off-by: Dengke Du <dengke.du@windriver.com>
30 30
31Upstream-Status: Pending 31Upstream-Status: Pending
32
32--- 33---
33 configure.in | 8 ++++---- 34 configure.in | 8 ++++----
34 1 file changed, 4 insertions(+), 4 deletions(-) 35 1 file changed, 4 insertions(+), 4 deletions(-)
35 36
36diff --git a/configure.in b/configure.in 37diff --git a/configure.in b/configure.in
37index 3b10422..a227e72 100644 38index 27b8539..fb408d1 100644
38--- a/configure.in 39--- a/configure.in
39+++ b/configure.in 40+++ b/configure.in
40@@ -1769,7 +1769,7 @@ else 41@@ -1801,7 +1801,7 @@ else
41 socklen_t_value="int" 42 socklen_t_value="int"
42 fi 43 fi
43 44
@@ -46,25 +47,25 @@ index 3b10422..a227e72 100644
46 47
47 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then 48 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
48 pid_t_fmt='#define APR_PID_T_FMT "hd"' 49 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@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [
50 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) 51 APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
51 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) 52 ])
52 53
53-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) 54-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
54+AC_CHECK_SIZEOF(ssize_t) 55+AC_CHECK_SIZEOF(ssize_t)
55 56
57 dnl the else cases below should no longer occur;
56 AC_MSG_CHECKING([which format to use for apr_ssize_t]) 58 AC_MSG_CHECKING([which format to use for apr_ssize_t])
57 if test -n "$ssize_t_fmt"; then 59@@ -1891,7 +1891,7 @@ fi
58@@ -1855,7 +1855,7 @@ fi
59 60
60 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" 61 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
61 62
62-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) 63-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
63+AC_CHECK_SIZEOF(size_t) 64+AC_CHECK_SIZEOF(size_t)
64 65
66 # else cases below should no longer occur;
65 AC_MSG_CHECKING([which format to use for apr_size_t]) 67 AC_MSG_CHECKING([which format to use for apr_size_t])
66 if test -n "$size_t_fmt"; then 68@@ -1909,7 +1909,7 @@ fi
67@@ -1872,7 +1872,7 @@ fi
68 69
69 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" 70 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
70 71
@@ -73,6 +74,3 @@ index 3b10422..a227e72 100644
73 74
74 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then 75 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
75 # Enable LFS 76 # Enable LFS
76--
771.8.3.1
78
diff --git a/meta/recipes-support/apr/apr_1.6.5.bb b/meta/recipes-support/apr/apr_1.7.0.bb
index 432e4ed744..a58651d077 100644
--- a/meta/recipes-support/apr/apr_1.6.5.bb
+++ b/meta/recipes-support/apr/apr_1.7.0.bb
@@ -20,8 +20,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ 20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
21 " 21 "
22 22
23SRC_URI[md5sum] = "ad4add8efdfe87330b88e5e788241775" 23SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7"
24SRC_URI[sha256sum] = "a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105" 24SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea"
25 25
26inherit autotools-brokensep lib_package binconfig multilib_header ptest 26inherit autotools-brokensep lib_package binconfig multilib_header ptest
27 27