mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
apr: upgrade 1.7.5 -> 1.7.6
0001-Add-option-to-disable-timed-dependant-tests.patch 0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch 0002-apr-Remove-workdir-path-references-from-installed-ap.patch 0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch refreshed for 1.7.6 (From OE-Core rev: 21721ba0701acbb691d59da7892af10a222d3fcb) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fa2205efd5
commit
949e2cc738
|
@ -1,4 +1,4 @@
|
|||
From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001
|
||||
From dc02ac2f43e47178a9b1f35ef6906d7835dc121b Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Puhlman <jpuhlman@mvista.com>
|
||||
Date: Thu, 26 Mar 2020 18:30:36 +0000
|
||||
Subject: [PATCH] Add option to disable timed dependant tests
|
||||
|
@ -9,7 +9,6 @@ a timer or other timing related issues.
|
|||
|
||||
Upstream-Status: Submitted [https://github.com/apache/apr/pull/54]
|
||||
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
|
||||
|
||||
---
|
||||
configure.in | 6 ++++++
|
||||
include/apr.h.in | 1 +
|
||||
|
@ -17,10 +16,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
|
|||
3 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index bfd488b..3663220 100644
|
||||
index 0ce20ab..3d42953 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks,
|
||||
@@ -3119,6 +3119,12 @@ AC_ARG_ENABLE(timedlocks,
|
||||
)
|
||||
AC_SUBST(apr_has_timedlocks)
|
||||
|
||||
|
@ -34,10 +33,10 @@ index bfd488b..3663220 100644
|
|||
# so getaddrinfo/gai_strerror are not used.
|
||||
if test $have_ipv6 = 0; then
|
||||
diff --git a/include/apr.h.in b/include/apr.h.in
|
||||
index ee99def..c46a5f4 100644
|
||||
index 637ed38..e7cb9b9 100644
|
||||
--- a/include/apr.h.in
|
||||
+++ b/include/apr.h.in
|
||||
@@ -298,6 +298,7 @@ extern "C" {
|
||||
@@ -307,6 +307,7 @@ extern "C" {
|
||||
#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@
|
||||
#define APR_HAS_OS_UUID @osuuid@
|
||||
#define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001
|
||||
From 84990901ba642238779c74a003c1f5e572ab8d38 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 26 Aug 2022 00:28:08 -0700
|
||||
Subject: [PATCH] configure: Remove runtime test for mmap that can map
|
||||
|
@ -10,16 +10,15 @@ mutexes
|
|||
|
||||
Upstream-Status: Inappropriate [Cross-compile specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
---
|
||||
configure.in | 30 ------------------------------
|
||||
1 file changed, 30 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 3663220..dce9789 100644
|
||||
index 3d42953..7e43b0f 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
|
||||
@@ -1391,36 +1391,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
|
||||
APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
|
||||
AC_CHECK_FILE(/dev/zero)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001
|
||||
From 5050645e626a8ee91a7f45070ef2d3911e1870d7 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 30 Jan 2018 09:39:06 +0800
|
||||
Subject: [PATCH] apr: Remove workdir path references from installed apr files
|
||||
|
@ -13,16 +13,15 @@ packages at target run time, the workdir path caused confusion.
|
|||
Rebase to 1.6.3
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
apr-config.in | 32 ++------------------------------
|
||||
1 file changed, 2 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/apr-config.in b/apr-config.in
|
||||
index bed47ca..47874e5 100644
|
||||
index 626d3b0..42be269 100644
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -164,16 +164,7 @@ while test $# -gt 0; do
|
||||
@@ -179,16 +179,7 @@ while test $# -gt 0; do
|
||||
flags="$flags $LDFLAGS"
|
||||
;;
|
||||
--includes)
|
||||
|
@ -39,7 +38,7 @@ index bed47ca..47874e5 100644
|
|||
;;
|
||||
--srcdir)
|
||||
echo $APR_SOURCE_DIR
|
||||
@@ -197,33 +188,14 @@ while test $# -gt 0; do
|
||||
@@ -212,33 +203,14 @@ while test $# -gt 0; do
|
||||
exit 0
|
||||
;;
|
||||
--link-ld)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 2e66cece0c3adff92733332111204ddc1d730a07 Mon Sep 17 00:00:00 2001
|
||||
From 2f5db35d6c6b4d40e04591c98d297ef764777aa3 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Thu, 19 Nov 2015 18:25:38 -0800
|
||||
Subject: [PATCH 5/7] configure.in: fix LTFLAGS to make it work with ccache
|
||||
Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache
|
||||
|
||||
When ccache is enabled, libtool requires --tag=CC when use ccache,
|
||||
otherwise when building apr-util with ccache enabled:
|
||||
|
@ -19,10 +19,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 361120f..3b10422 100644
|
||||
index b0457e2..0ce20ab 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -249,7 +249,7 @@ case $host in
|
||||
@@ -266,7 +266,7 @@ case $host in
|
||||
;;
|
||||
*)
|
||||
if test "x$LTFLAGS" = "x"; then
|
||||
|
@ -31,6 +31,3 @@ index 361120f..3b10422 100644
|
|||
fi
|
||||
if test "$experimental_libtool" = "yes"; then
|
||||
# Use a custom-made libtool replacement
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
|
|||
file://0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2"
|
||||
SRC_URI[sha256sum] = "49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32"
|
||||
|
||||
inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script
|
||||
|
Loading…
Reference in New Issue
Block a user