diff options
Diffstat (limited to 'external/poky/meta/recipes-support/apr/apr')
5 files changed, 109 insertions, 78 deletions
diff --git a/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch new file mode 100644 index 00000000..abff4e93 --- /dev/null +++ b/external/poky/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -0,0 +1,69 @@ +From 2bbe20b4f69e84e7a18bc79d382486953f479328 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 + +The disabled tests rely on timing to pass correctly. On a virtualized +system under heavy load, these tests randomly fail because they miss +a timer or other timing related issues. + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + configure.in | 6 ++++++ + include/apr.h.in | 1 + + test/testlock.c | 4 ++-- + 3 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index d9f32d6..f0c5661 100644 +--- a/configure.in ++++ b/configure.in +@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks, + ) + AC_SUBST(apr_has_timedlocks) + ++AC_ARG_ENABLE(timed-tests, ++ [ --disable-timed-tests Disable timed tests ], ++ [apr_has_timedtests="0"], [apr_has_timedtests="1"] ++) ++AC_SUBST(apr_has_timedtests) ++ + # hstrerror is only needed if IPv6 is not enabled, + # 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 +--- a/include/apr.h.in ++++ b/include/apr.h.in +@@ -298,6 +298,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@ ++#define APR_HAVE_TIME_DEPENDANT_TESTS @apr_has_timedtests@ + + #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@ + +diff --git a/test/testlock.c b/test/testlock.c +index a43f477..6233d0b 100644 +--- a/test/testlock.c ++++ b/test/testlock.c +@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite) + abts_run_test(suite, threads_not_impl, NULL); + #else + abts_run_test(suite, test_thread_mutex, NULL); +-#if APR_HAS_TIMEDLOCKS ++#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS + abts_run_test(suite, test_thread_timedmutex, NULL); + #endif + abts_run_test(suite, test_thread_rwlock, NULL); + abts_run_test(suite, test_cond, NULL); + abts_run_test(suite, test_timeoutcond, NULL); +-#if APR_HAS_TIMEDLOCKS ++#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS + abts_run_test(suite, test_timeoutmutex, NULL); + #endif + #endif +-- +2.23.0 + diff --git a/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch deleted file mode 100644 index 097c195a..00000000 --- a/external/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4efdc06fb17b8a00a9eca923caa176be741d1e04 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 1 Feb 2018 14:56:13 +0800 -Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection - -Support customize libtool by variable assigning, it is helpful -for cross compileing (such as libtool=aarch64-linux-libtool) - -Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - build/buildcheck.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build/buildcheck.sh b/build/buildcheck.sh -index ab5df44..f191a41 100755 ---- a/build/buildcheck.sh -+++ b/build/buildcheck.sh -@@ -40,7 +40,9 @@ fi - # output is multiline from 1.5 onwards - - # Require libtool 1.4 or newer --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` -+if test -z "$libtool"; then -+ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` -+fi - lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch index 5f5e7eac..d1a2ebe8 100644 --- a/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch +++ b/external/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch @@ -1,7 +1,7 @@ -From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 Mon Sep 17 00:00:00 2001 +From 49661ea3858cf8494926cccf57d3e8c6dcb47117 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 +Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross compiling In configure.in, it contains the following: @@ -29,15 +29,16 @@ 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 +index 27b8539..fb408d1 100644 --- a/configure.in +++ b/configure.in -@@ -1769,7 +1769,7 @@ else +@@ -1801,7 +1801,7 @@ else socklen_t_value="int" fi @@ -46,25 +47,25 @@ index 3b10422..a227e72 100644 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"]) +@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [ + APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"]) + ]) -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) +AC_CHECK_SIZEOF(ssize_t) + dnl the else cases below should no longer occur; AC_MSG_CHECKING([which format to use for apr_ssize_t]) - if test -n "$ssize_t_fmt"; then -@@ -1855,7 +1855,7 @@ fi +@@ -1891,7 +1891,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) + # else cases below should no longer occur; AC_MSG_CHECKING([which format to use for apr_size_t]) - if test -n "$size_t_fmt"; then -@@ -1872,7 +1872,7 @@ fi +@@ -1909,7 +1909,7 @@ fi size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" @@ -73,6 +74,3 @@ index 3b10422..a227e72 100644 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then # Enable LFS --- -1.8.3.1 - diff --git a/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch b/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch deleted file mode 100644 index 6809fa60..00000000 --- a/external/poky/meta/recipes-support/apr/apr/0008-apr-fix-ptest-hang-in-teststr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 036f90748247417dbfa714b1b912ca7dd4053f04 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 23 Jul 2018 14:12:35 +0800 -Subject: [PATCH] apr: fix ptest hang in teststr - -ptest hang in teststr since turns into a non-terminating loop, -fix by below backported patch. - -Upstream-Status: Backport[https://github.com/apache/apr/commit/ - 2e8fbff4ecf82d0decf6baf774c209948f2f4998?diff=unified] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - test/teststr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/teststr.c b/test/teststr.c -index d9a5054..951a830 100644 ---- a/test/teststr.c -+++ b/test/teststr.c -@@ -307,7 +307,7 @@ static void overflow_strfsize(abts_case *tc, void *data) - for (; off < 999999999; off += 999) { - apr_strfsize(off, buf); - } -- for (off = 1; off < LONG_MAX && off > 0; off *= 2) { -+ for (off = LONG_MAX; off > 1; off /= 2) { - apr_strfsize(off, buf); - apr_strfsize(off + 1, buf); - apr_strfsize(off - 1, buf); --- -2.7.4 - diff --git a/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch b/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch new file mode 100644 index 00000000..740792e6 --- /dev/null +++ b/external/poky/meta/recipes-support/apr/apr/libtoolize_check.patch @@ -0,0 +1,28 @@ +From: Helmut Grohne <helmut@subdivi.de> +Subject: check for libtoolize rather than libtool +Last-Update: 2014-09-19 + +libtool is now in package libtool-bin, but apr only needs libtoolize. + +Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + +--- apr.orig/build/buildcheck.sh ++++ apr/build/buildcheck.sh +@@ -39,11 +39,11 @@ fi + # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a + # output is multiline from 1.5 onwards + +-# Require libtool 1.4 or newer +-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` +-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++# Require libtoolize 1.4 or newer ++libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` + if test -z "$lt_pversion"; then +- echo "buildconf: libtool not found." ++ echo "buildconf: libtoolize not found." + echo " You need libtool version 1.4 or newer installed" + echo " to build APR from SVN." + res=1 |