diff options
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r-- | meta/recipes-support/apr/apr-util/configure_fixes.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr-util_1.6.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | 13 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch | 9 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch | 9 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch | 11 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch | 50 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr/libtoolize_check.patch | 37 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr_1.7.6.bb (renamed from meta/recipes-support/apr/apr_1.7.4.bb) | 6 |
9 files changed, 20 insertions, 148 deletions
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch deleted file mode 100644 index 91e244ce2c..0000000000 --- a/meta/recipes-support/apr/apr-util/configure_fixes.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: apr-util-1.4.1/configure.in | ||
4 | =================================================================== | ||
5 | --- apr-util-1.4.1.orig/configure.in 2009-12-18 03:15:19.000000000 +0800 | ||
6 | +++ apr-util-1.4.1/configure.in 2011-12-30 13:32:07.000000000 +0800 | ||
7 | @@ -8,15 +8,15 @@ | ||
8 | AC_CONFIG_HEADER(include/private/apu_config.h) | ||
9 | AC_CONFIG_AUX_DIR(build) | ||
10 | |||
11 | -sinclude(build/apu-conf.m4) | ||
12 | -sinclude(build/apu-iconv.m4) | ||
13 | -sinclude(build/apu-hints.m4) | ||
14 | -sinclude(build/apr_common.m4) | ||
15 | -sinclude(build/find_apr.m4) | ||
16 | -sinclude(build/crypto.m4) | ||
17 | -sinclude(build/dbm.m4) | ||
18 | -sinclude(build/dbd.m4) | ||
19 | -sinclude(build/dso.m4) | ||
20 | +#sinclude(build/apu-conf.m4) | ||
21 | +#sinclude(build/apu-iconv.m4) | ||
22 | +#sinclude(build/apu-hints.m4) | ||
23 | +#sinclude(build/apr_common.m4) | ||
24 | +#sinclude(build/find_apr.m4) | ||
25 | +#sinclude(build/crypto.m4) | ||
26 | +#sinclude(build/dbm.m4) | ||
27 | +#sinclude(build/dbd.m4) | ||
28 | +#sinclude(build/dso.m4) | ||
29 | |||
30 | dnl Generate ./config.nice for reproducing runs of configure | ||
31 | dnl | ||
diff --git a/meta/recipes-support/apr/apr-util_1.6.3.bb b/meta/recipes-support/apr/apr-util_1.6.3.bb index 1371e262dd..b5e3d2fc8a 100644 --- a/meta/recipes-support/apr/apr-util_1.6.3.bb +++ b/meta/recipes-support/apr/apr-util_1.6.3.bb | |||
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=158aa0b1efe0c12f23d4b007ddb9a5db \ | |||
11 | 11 | ||
12 | SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ | 12 | SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ |
13 | file://configfix.patch \ | 13 | file://configfix.patch \ |
14 | file://configure_fixes.patch \ | ||
15 | file://0001-test_transformation-Check-if-transform-is-supported-.patch \ | 14 | file://0001-test_transformation-Check-if-transform-is-supported-.patch \ |
16 | file://run-ptest \ | 15 | file://run-ptest \ |
17 | " | 16 | " |
@@ -24,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | |||
24 | --without-sqlite2 \ | 23 | --without-sqlite2 \ |
25 | --with-expat=${STAGING_DIR_HOST}${prefix}" | 24 | --with-expat=${STAGING_DIR_HOST}${prefix}" |
26 | 25 | ||
27 | |||
28 | inherit autotools lib_package binconfig multilib_script | 26 | inherit autotools lib_package binconfig multilib_script |
29 | 27 | ||
30 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" | 28 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" |
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index a274f3a16e..72a2ab777e 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 | 1 | From dc02ac2f43e47178a9b1f35ef6906d7835dc121b Mon Sep 17 00:00:00 2001 |
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | 2 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
3 | Date: Thu, 26 Mar 2020 18:30:36 +0000 | 3 | Date: Thu, 26 Mar 2020 18:30:36 +0000 |
4 | Subject: [PATCH] Add option to disable timed dependant tests | 4 | Subject: [PATCH] Add option to disable timed dependant tests |
@@ -7,9 +7,8 @@ The disabled tests rely on timing to pass correctly. On a virtualized | |||
7 | system under heavy load, these tests randomly fail because they miss | 7 | system under heavy load, these tests randomly fail because they miss |
8 | a timer or other timing related issues. | 8 | a timer or other timing related issues. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] |
11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | 11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
12 | |||
13 | --- | 12 | --- |
14 | configure.in | 6 ++++++ | 13 | configure.in | 6 ++++++ |
15 | include/apr.h.in | 1 + | 14 | include/apr.h.in | 1 + |
@@ -17,10 +16,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | |||
17 | 3 files changed, 9 insertions(+), 2 deletions(-) | 16 | 3 files changed, 9 insertions(+), 2 deletions(-) |
18 | 17 | ||
19 | diff --git a/configure.in b/configure.in | 18 | diff --git a/configure.in b/configure.in |
20 | index bfd488b..3663220 100644 | 19 | index 0ce20ab..3d42953 100644 |
21 | --- a/configure.in | 20 | --- a/configure.in |
22 | +++ b/configure.in | 21 | +++ b/configure.in |
23 | @@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, | 22 | @@ -3119,6 +3119,12 @@ AC_ARG_ENABLE(timedlocks, |
24 | ) | 23 | ) |
25 | AC_SUBST(apr_has_timedlocks) | 24 | AC_SUBST(apr_has_timedlocks) |
26 | 25 | ||
@@ -34,10 +33,10 @@ index bfd488b..3663220 100644 | |||
34 | # so getaddrinfo/gai_strerror are not used. | 33 | # so getaddrinfo/gai_strerror are not used. |
35 | if test $have_ipv6 = 0; then | 34 | if test $have_ipv6 = 0; then |
36 | diff --git a/include/apr.h.in b/include/apr.h.in | 35 | diff --git a/include/apr.h.in b/include/apr.h.in |
37 | index ee99def..c46a5f4 100644 | 36 | index 637ed38..e7cb9b9 100644 |
38 | --- a/include/apr.h.in | 37 | --- a/include/apr.h.in |
39 | +++ b/include/apr.h.in | 38 | +++ b/include/apr.h.in |
40 | @@ -298,6 +298,7 @@ extern "C" { | 39 | @@ -307,6 +307,7 @@ extern "C" { |
41 | #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ | 40 | #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ |
42 | #define APR_HAS_OS_UUID @osuuid@ | 41 | #define APR_HAS_OS_UUID @osuuid@ |
43 | #define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ | 42 | #define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ |
diff --git a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch index a78b16284f..7e22270b88 100644 --- a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch +++ b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001 | 1 | From 84990901ba642238779c74a003c1f5e572ab8d38 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 26 Aug 2022 00:28:08 -0700 | 3 | Date: Fri, 26 Aug 2022 00:28:08 -0700 |
4 | Subject: [PATCH] configure: Remove runtime test for mmap that can map | 4 | Subject: [PATCH] configure: Remove runtime test for mmap that can map |
@@ -10,16 +10,15 @@ mutexes | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [Cross-compile specific] | 11 | Upstream-Status: Inappropriate [Cross-compile specific] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | configure.in | 30 ------------------------------ | 14 | configure.in | 30 ------------------------------ |
16 | 1 file changed, 30 deletions(-) | 15 | 1 file changed, 30 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.in b/configure.in | 17 | diff --git a/configure.in b/configure.in |
19 | index 3663220..dce9789 100644 | 18 | index 3d42953..7e43b0f 100644 |
20 | --- a/configure.in | 19 | --- a/configure.in |
21 | +++ b/configure.in | 20 | +++ b/configure.in |
22 | @@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ | 21 | @@ -1391,36 +1391,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ |
23 | APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) | 22 | APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) |
24 | AC_CHECK_FILE(/dev/zero) | 23 | AC_CHECK_FILE(/dev/zero) |
25 | 24 | ||
@@ -34,7 +33,7 @@ index 3663220..dce9789 100644 | |||
34 | -#ifdef HAVE_SYS_MMAN_H | 33 | -#ifdef HAVE_SYS_MMAN_H |
35 | -#include <sys/mman.h> | 34 | -#include <sys/mman.h> |
36 | -#endif | 35 | -#endif |
37 | - int main() | 36 | - int main(int argc, const char *argv[]) |
38 | - { | 37 | - { |
39 | - int fd; | 38 | - int fd; |
40 | - void *m; | 39 | - void *m; |
diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index d63423f3a1..2a9cfb0f3d 100644 --- a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch +++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 | 1 | From 5050645e626a8ee91a7f45070ef2d3911e1870d7 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 30 Jan 2018 09:39:06 +0800 | 3 | Date: Tue, 30 Jan 2018 09:39:06 +0800 |
4 | Subject: [PATCH] apr: Remove workdir path references from installed apr files | 4 | 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. | |||
13 | Rebase to 1.6.3 | 13 | Rebase to 1.6.3 |
14 | 14 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | |||
17 | --- | 16 | --- |
18 | apr-config.in | 32 ++------------------------------ | 17 | apr-config.in | 32 ++------------------------------ |
19 | 1 file changed, 2 insertions(+), 30 deletions(-) | 18 | 1 file changed, 2 insertions(+), 30 deletions(-) |
20 | 19 | ||
21 | diff --git a/apr-config.in b/apr-config.in | 20 | diff --git a/apr-config.in b/apr-config.in |
22 | index bed47ca..47874e5 100644 | 21 | index 626d3b0..42be269 100644 |
23 | --- a/apr-config.in | 22 | --- a/apr-config.in |
24 | +++ b/apr-config.in | 23 | +++ b/apr-config.in |
25 | @@ -164,16 +164,7 @@ while test $# -gt 0; do | 24 | @@ -179,16 +179,7 @@ while test $# -gt 0; do |
26 | flags="$flags $LDFLAGS" | 25 | flags="$flags $LDFLAGS" |
27 | ;; | 26 | ;; |
28 | --includes) | 27 | --includes) |
@@ -39,7 +38,7 @@ index bed47ca..47874e5 100644 | |||
39 | ;; | 38 | ;; |
40 | --srcdir) | 39 | --srcdir) |
41 | echo $APR_SOURCE_DIR | 40 | echo $APR_SOURCE_DIR |
42 | @@ -197,33 +188,14 @@ while test $# -gt 0; do | 41 | @@ -212,33 +203,14 @@ while test $# -gt 0; do |
43 | exit 0 | 42 | exit 0 |
44 | ;; | 43 | ;; |
45 | --link-ld) | 44 | --link-ld) |
diff --git a/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch index 02634e6fde..bd8e7786ba 100644 --- a/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +++ b/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2e66cece0c3adff92733332111204ddc1d730a07 Mon Sep 17 00:00:00 2001 | 1 | From 2f5db35d6c6b4d40e04591c98d297ef764777aa3 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Thu, 19 Nov 2015 18:25:38 -0800 | 3 | Date: Thu, 19 Nov 2015 18:25:38 -0800 |
4 | Subject: [PATCH 5/7] configure.in: fix LTFLAGS to make it work with ccache | 4 | Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache |
5 | 5 | ||
6 | When ccache is enabled, libtool requires --tag=CC when use ccache, | 6 | When ccache is enabled, libtool requires --tag=CC when use ccache, |
7 | otherwise when building apr-util with ccache enabled: | 7 | otherwise when building apr-util with ccache enabled: |
@@ -19,10 +19,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/configure.in b/configure.in | 21 | diff --git a/configure.in b/configure.in |
22 | index 361120f..3b10422 100644 | 22 | index b0457e2..0ce20ab 100644 |
23 | --- a/configure.in | 23 | --- a/configure.in |
24 | +++ b/configure.in | 24 | +++ b/configure.in |
25 | @@ -249,7 +249,7 @@ case $host in | 25 | @@ -266,7 +266,7 @@ case $host in |
26 | ;; | 26 | ;; |
27 | *) | 27 | *) |
28 | if test "x$LTFLAGS" = "x"; then | 28 | if test "x$LTFLAGS" = "x"; then |
@@ -31,6 +31,3 @@ index 361120f..3b10422 100644 | |||
31 | fi | 31 | fi |
32 | if test "$experimental_libtool" = "yes"; then | 32 | if test "$experimental_libtool" = "yes"; then |
33 | # Use a custom-made libtool replacement | 33 | # Use a custom-made libtool replacement |
34 | -- | ||
35 | 1.8.3.1 | ||
36 | |||
diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140c..0000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 3 Mar 2017 22:24:17 +0100 | ||
4 | Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy | ||
5 | on test | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' | ||
11 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' | ||
12 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' | ||
13 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' | ||
14 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' | ||
15 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' | ||
16 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' | ||
17 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' | ||
18 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' | ||
19 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' | ||
20 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' | ||
21 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' | ||
22 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' | ||
23 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' | ||
24 | | collect2: error: ld returned 1 exit status | ||
25 | | Makefile:114: recipe for target 'globalmutexchild' failed | ||
26 | | make[1]: *** [globalmutexchild] Error 1 | ||
27 | | make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' | ||
28 | |||
29 | Upstream-Status: Pending | ||
30 | |||
31 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
32 | --- | ||
33 | configure.in | 1 + | ||
34 | 1 file changed, 1 insertion(+) | ||
35 | |||
36 | diff --git a/configure.in b/configure.in | ||
37 | index a227e72..cbc0f90 100644 | ||
38 | --- a/configure.in | ||
39 | +++ b/configure.in | ||
40 | @@ -784,6 +784,7 @@ else | ||
41 | APR_PTHREADS_CHECK_RESTORE ] ) | ||
42 | fi | ||
43 | if test "$pthreadh" = "1"; then | ||
44 | + APR_ADDTO(LIBS,[-lpthread]) | ||
45 | APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS | ||
46 | APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG | ||
47 | APR_CHECK_PTHREAD_RECURSIVE_MUTEX | ||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch deleted file mode 100644 index 80ce43caa4..0000000000 --- a/meta/recipes-support/apr/apr/libtoolize_check.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 | ||
2 | From: Helmut Grohne <helmut@subdivi.de> | ||
3 | Date: Tue, 7 Feb 2023 07:04:00 +0000 | ||
4 | Subject: [PATCH] check for libtoolize rather than libtool | ||
5 | |||
6 | libtool is now in package libtool-bin, but apr only needs libtoolize. | ||
7 | |||
8 | Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | |||
12 | --- | ||
13 | build/buildcheck.sh | 10 ++++------ | ||
14 | 1 file changed, 4 insertions(+), 6 deletions(-) | ||
15 | |||
16 | diff --git a/build/buildcheck.sh b/build/buildcheck.sh | ||
17 | index 44921b5..08bc8a8 100755 | ||
18 | --- a/build/buildcheck.sh | ||
19 | +++ b/build/buildcheck.sh | ||
20 | @@ -39,13 +39,11 @@ fi | ||
21 | # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a | ||
22 | # output is multiline from 1.5 onwards | ||
23 | |||
24 | -# Require libtool 1.4 or newer | ||
25 | -if test -z "$libtool"; then | ||
26 | - libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
27 | -fi | ||
28 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
29 | +# Require libtoolize 1.4 or newer | ||
30 | +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` | ||
31 | +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
32 | if test -z "$lt_pversion"; then | ||
33 | - echo "buildconf: libtool not found." | ||
34 | + echo "buildconf: libtoolize not found." | ||
35 | echo " You need libtool version 1.4 or newer installed" | ||
36 | echo " to build APR from SVN." | ||
37 | res=1 | ||
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.6.bb index d322629b66..13fa5daa3c 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.6.bb | |||
@@ -18,15 +18,13 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ | 18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ |
19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ | 19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ |
20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ | 20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ |
21 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ | ||
22 | file://libtoolize_check.patch \ | ||
23 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 21 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
24 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ | 22 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ |
25 | file://autoconf-2.73.patch \ | 23 | file://autoconf-2.73.patch \ |
26 | file://0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch \ | 24 | file://0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch \ |
27 | " | 25 | " |
28 | 26 | ||
29 | SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" | 27 | SRC_URI[sha256sum] = "49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32" |
30 | 28 | ||
31 | inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script | 29 | inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script |
32 | 30 | ||
@@ -136,4 +134,4 @@ do_install_ptest() { | |||
136 | cp ${S}/test/tryread $t/ | 134 | cp ${S}/test/tryread $t/ |
137 | } | 135 | } |
138 | 136 | ||
139 | export CONFIG_SHELL="/bin/bash" | 137 | export CONFIG_SHELL = "/bin/bash" |