summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch32
-rw-r--r--meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch (renamed from meta/recipes-support/apr/apr/configfix.patch)33
-rw-r--r--meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch63
-rw-r--r--meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch (renamed from meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch)15
-rw-r--r--meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch (renamed from meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch)12
-rw-r--r--meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch (renamed from meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch)16
-rw-r--r--meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch (renamed from meta/recipes-support/apr/apr/0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch)12
-rw-r--r--meta/recipes-support/apr/apr/cleanup.patch43
-rw-r--r--meta/recipes-support/apr/apr/configure_fixes.patch68
-rw-r--r--meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch45
-rw-r--r--meta/recipes-support/apr/apr_1.6.3.bb (renamed from meta/recipes-support/apr/apr_1.6.2.bb)27
11 files changed, 168 insertions, 198 deletions
diff --git a/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
new file mode 100644
index 0000000000..097c195a19
--- /dev/null
+++ b/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
@@ -0,0 +1,32 @@
1From 4efdc06fb17b8a00a9eca923caa176be741d1e04 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Feb 2018 14:56:13 +0800
4Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection
5
6Support customize libtool by variable assigning, it is helpful
7for cross compileing (such as libtool=aarch64-linux-libtool)
8
9Upstream-Status: Submitted [https://github.com/apache/apr/pull/8]
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 build/buildcheck.sh | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15diff --git a/build/buildcheck.sh b/build/buildcheck.sh
16index ab5df44..f191a41 100755
17--- a/build/buildcheck.sh
18+++ b/build/buildcheck.sh
19@@ -40,7 +40,9 @@ fi
20 # output is multiline from 1.5 onwards
21
22 # Require libtool 1.4 or newer
23-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
24+if test -z "$libtool"; then
25+ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
26+fi
27 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
28 if test -z "$lt_pversion"; then
29 echo "buildconf: libtool not found."
30--
311.8.3.1
32
diff --git a/meta/recipes-support/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
index 605c4f632c..72e706f966 100644
--- a/meta/recipes-support/apr/apr/configfix.patch
+++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
@@ -1,10 +1,28 @@
1From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 30 Jan 2018 09:39:06 +0800
4Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr
5 files
6
1Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
2 8
3Index: apr-1.3.3/apr-config.in 9Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4=================================================================== 10
5--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 11The generated `apr-1-config' is used by other recipes at build time or
6+++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 12packages at target run time, the workdir path caused confusion.
7@@ -152,14 +152,7 @@ 13
14Rebase to 1.6.3
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 apr-config.in | 26 ++------------------------
19 1 file changed, 2 insertions(+), 24 deletions(-)
20
21diff --git a/apr-config.in b/apr-config.in
22index 84b4073..bbbf651 100644
23--- a/apr-config.in
24+++ b/apr-config.in
25@@ -152,14 +152,7 @@ while test $# -gt 0; do
8 flags="$flags $LDFLAGS" 26 flags="$flags $LDFLAGS"
9 ;; 27 ;;
10 --includes) 28 --includes)
@@ -19,7 +37,7 @@ Index: apr-1.3.3/apr-config.in
19 ;; 37 ;;
20 --srcdir) 38 --srcdir)
21 echo $APR_SOURCE_DIR 39 echo $APR_SOURCE_DIR
22@@ -181,29 +167,14 @@ 40@@ -181,29 +174,14 @@ while test $# -gt 0; do
23 exit 0 41 exit 0
24 ;; 42 ;;
25 --link-ld) 43 --link-ld)
@@ -51,3 +69,6 @@ Index: apr-1.3.3/apr-config.in
51 ;; 69 ;;
52 --shlib-path-var) 70 --shlib-path-var)
53 echo "$SHLIBPATH_VAR" 71 echo "$SHLIBPATH_VAR"
72--
731.8.3.1
74
diff --git a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
new file mode 100644
index 0000000000..4dd53bd8eb
--- /dev/null
+++ b/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
@@ -0,0 +1,63 @@
1From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 2 Feb 2018 15:51:42 +0800
4Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling
5
6While cross compiling, the tools/gen_test_char could not
7be executed at build time, use AX_PROG_CC_FOR_BUILD to
8build native tools/gen_test_char
9
10Upstream-Status: Submitted [https://github.com/apache/apr/pull/8]
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 Makefile.in | 10 +++-------
15 configure.in | 3 +++
16 2 files changed, 6 insertions(+), 7 deletions(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index 5fb760e..8675f90 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@
23
24 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
25 build/apr_rules.out tools/gen_test_char@EXEEXT@ \
26- tools/gen_test_char.o tools/gen_test_char.lo \
27+ tools/gen_test_char.o \
28 include/private/apr_escape_test_char.h
29 DISTCLEAN_TARGETS = config.cache config.log config.status \
30 include/apr.h include/arch/unix/apr_private.h \
31@@ -131,13 +131,9 @@ check: $(TARGET_LIB)
32 etags:
33 etags `find . -name '*.[ch]'`
34
35-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
36-tools/gen_test_char.lo: tools/gen_test_char.c
37+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
38 $(APR_MKDIR) tools
39- $(LT_COMPILE)
40-
41-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
42- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
43+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
44
45 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
46 $(APR_MKDIR) include/private
47diff --git a/configure.in b/configure.in
48index 719f331..361120f 100644
49--- a/configure.in
50+++ b/configure.in
51@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a
52 dnl preload section from invoking the macro to get compiler info.
53 AC_PROG_CC
54
55+dnl Check build CC for gen_test_char compiling which is executed at build time.
56+AX_PROG_CC_FOR_BUILD
57+
58 dnl AC_PROG_SED is only avaliable in recent autoconf versions.
59 dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
60 ifdef([AC_PROG_SED],
61--
621.8.3.1
63
diff --git a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch
index 6805b8b6e2..30fc07d4a0 100644
--- a/meta/recipes-support/apr/apr/Fix-packet-discards-HTTP-redirect.patch
+++ b/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch
@@ -1,4 +1,7 @@
1Fix packet discards HTTP redirect. 1From 7925eb1766a00ccee05c6e80b1d34f163a04b7b1 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 30 Jan 2018 09:43:34 +0800
4Subject: [PATCH 4/7] Fix packet discards HTTP redirect.
2 5
3Disconnect the connection by poll() timeout. 6Disconnect the connection by poll() timeout.
4If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then 7If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
@@ -8,12 +11,16 @@ Upstream-Status: Pending
8 11
9Signed-off-by: Noriaki Yoshitane <yoshitane.nrs@cnt.ncos.nec.co.jp> 12Signed-off-by: Noriaki Yoshitane <yoshitane.nrs@cnt.ncos.nec.co.jp>
10Signed-off-by: Li Wang <li.wang@windriver.com> 13Signed-off-by: Li Wang <li.wang@windriver.com>
14
15Rebase to 1.6.3
16
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11--- 18---
12 network_io/unix/sendrecv.c | 4 ++++ 19 network_io/unix/sendrecv.c | 4 ++++
13 1 file changed, 4 insertions(+) 20 1 file changed, 4 insertions(+)
14 21
15diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c 22diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
16index c133a26..e8faf15 100644 23index 4c0e0a6..1bdafba 100644
17--- a/network_io/unix/sendrecv.c 24--- a/network_io/unix/sendrecv.c
18+++ b/network_io/unix/sendrecv.c 25+++ b/network_io/unix/sendrecv.c
19@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len) 26@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
@@ -28,5 +35,5 @@ index c133a26..e8faf15 100644
28 *len = 0; 35 *len = 0;
29 return arv; 36 return arv;
30-- 37--
311.7.9.5 381.8.3.1
32 39
diff --git a/meta/recipes-support/apr/apr/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 7521eeb469..02634e6fde 100644
--- a/meta/recipes-support/apr/apr/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 @@
1From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 1From 2e66cece0c3adff92733332111204ddc1d730a07 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 19 Nov 2015 18:25:38 -0800 3Date: Thu, 19 Nov 2015 18:25:38 -0800
4Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache 4Subject: [PATCH 5/7] configure.in: fix LTFLAGS to make it work with ccache
5 5
6When ccache is enabled, libtool requires --tag=CC when use ccache, 6When ccache is enabled, libtool requires --tag=CC when use ccache,
7otherwise when building apr-util with ccache enabled: 7otherwise when building apr-util with ccache enabled:
@@ -15,14 +15,14 @@ Upstream-Status: Pending
15 15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17--- 17---
18 configure.in | 2 +- 18 configure.in | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/configure.in b/configure.in 21diff --git a/configure.in b/configure.in
22index 5a4a988..9d57ae6 100644 22index 361120f..3b10422 100644
23--- a/configure.in 23--- a/configure.in
24+++ b/configure.in 24+++ b/configure.in
25@@ -246,7 +246,7 @@ case $host in 25@@ -249,7 +249,7 @@ case $host in
26 ;; 26 ;;
27 *) 27 *)
28 if test "x$LTFLAGS" = "x"; then 28 if test "x$LTFLAGS" = "x"; then
@@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644
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-- 34--
351.7.9.5 351.8.3.1
36 36
diff --git a/meta/recipes-support/apr/apr/0001-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 c5e92aceef..5f5e7eac32 100644
--- a/meta/recipes-support/apr/apr/0001-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 f26e8b88d2c90ed7eb9d4e276412b0923c23d10f Mon Sep 17 00:00:00 2001 1From f4d6e45ed5d2ccffd1af4c2ccdf7099ba0dce137 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] apr: fix off_t size doesn't match in glibc when cross 4Subject: [PATCH 6/7] 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:
@@ -34,10 +34,10 @@ Upstream-Status: Pending
34 1 file changed, 4 insertions(+), 4 deletions(-) 34 1 file changed, 4 insertions(+), 4 deletions(-)
35 35
36diff --git a/configure.in b/configure.in 36diff --git a/configure.in b/configure.in
37index 9d57ae6..5b19940 100644 37index 3b10422..a227e72 100644
38--- a/configure.in 38--- a/configure.in
39+++ b/configure.in 39+++ b/configure.in
40@@ -1681,7 +1681,7 @@ else 40@@ -1769,7 +1769,7 @@ else
41 socklen_t_value="int" 41 socklen_t_value="int"
42 fi 42 fi
43 43
@@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644
46 46
47 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then 47 if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
48 pid_t_fmt='#define APR_PID_T_FMT "hd"' 48 pid_t_fmt='#define APR_PID_T_FMT "hd"'
49@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"]) 49@@ -1838,7 +1838,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
50 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) 50 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
51 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) 51 APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
52 52
@@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644
55 55
56 AC_MSG_CHECKING([which format to use for apr_ssize_t]) 56 AC_MSG_CHECKING([which format to use for apr_ssize_t])
57 if test -n "$ssize_t_fmt"; then 57 if test -n "$ssize_t_fmt"; then
58@@ -1767,7 +1767,7 @@ fi 58@@ -1855,7 +1855,7 @@ fi
59 59
60 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" 60 ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
61 61
@@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644
64 64
65 AC_MSG_CHECKING([which format to use for apr_size_t]) 65 AC_MSG_CHECKING([which format to use for apr_size_t])
66 if test -n "$size_t_fmt"; then 66 if test -n "$size_t_fmt"; then
67@@ -1784,7 +1784,7 @@ fi 67@@ -1872,7 +1872,7 @@ fi
68 68
69 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" 69 size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
70 70
@@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644
74 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then 74 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
75 # Enable LFS 75 # Enable LFS
76-- 76--
772.7.4 771.8.3.1
78 78
diff --git a/meta/recipes-support/apr/apr/0002-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
index 7d0dddc530..8760b0140c 100644
--- a/meta/recipes-support/apr/apr/0002-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
@@ -1,8 +1,8 @@
1From 94d1ca0266a0f9c0446f1299b54f752e87b8a695 Mon Sep 17 00:00:00 2001 1From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 3 Mar 2017 22:24:17 +0100 3Date: Fri, 3 Mar 2017 22:24:17 +0100
4Subject: [PATCH] explicitly link libapr against phtread to make gold happy on 4Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy
5 test 5 on test
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit 8Content-Transfer-Encoding: 8bit
@@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
34 1 file changed, 1 insertion(+) 34 1 file changed, 1 insertion(+)
35 35
36diff --git a/configure.in b/configure.in 36diff --git a/configure.in b/configure.in
37index 5b19940..cdf4d58 100644 37index a227e72..cbc0f90 100644
38--- a/configure.in 38--- a/configure.in
39+++ b/configure.in 39+++ b/configure.in
40@@ -766,6 +766,7 @@ else 40@@ -784,6 +784,7 @@ else
41 APR_PTHREADS_CHECK_RESTORE ] ) 41 APR_PTHREADS_CHECK_RESTORE ] )
42 fi 42 fi
43 if test "$pthreadh" = "1"; then 43 if test "$pthreadh" = "1"; then
@@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644
46 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG 46 APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
47 APR_CHECK_PTHREAD_RECURSIVE_MUTEX 47 APR_CHECK_PTHREAD_RECURSIVE_MUTEX
48-- 48--
492.9.3 491.8.3.1
50 50
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
deleted file mode 100644
index b6784e015d..0000000000
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: apr-1.4.2/build/buildcheck.sh
4===================================================================
5--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
6+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800
7@@ -32,35 +32,4 @@
8 echo "buildconf: autoconf version $ac_version (ok)"
9 fi
10
11-# Sample libtool --version outputs:
12-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
13-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
14-# output is multiline from 1.5 onwards
15-
16-# Require libtool 1.4 or newer
17-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
18-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
19-if test -z "$lt_pversion"; then
20-echo "buildconf: libtool not found."
21-echo " You need libtool version 1.4 or newer installed"
22-echo " to build APR from SVN."
23-exit 1
24-fi
25-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
26-IFS=.; set $lt_version; IFS=' '
27-lt_status="good"
28-if test "$1" = "1"; then
29- if test "$2" -lt "4"; then
30- lt_status="bad"
31- fi
32-fi
33-if test $lt_status = "good"; then
34- echo "buildconf: libtool version $lt_pversion (ok)"
35- exit 0
36-fi
37-
38-echo "buildconf: libtool version $lt_pversion found."
39-echo " You need libtool version 1.4 or newer installed"
40-echo " to build APR from SVN."
41-
42-exit 1
43+exit 0
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 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: apr-1.3.3/configure.in
4===================================================================
5--- apr-1.3.3.orig/configure.in
6+++ apr-1.3.3/configure.in
7@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
8 create_area])
9
10 APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
11-AC_CHECK_FILE(/dev/zero)
12-
13-# Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
14-if test "$ac_cv_func_mmap" = "yes" &&
15- test "$ac_cv_file__dev_zero" = "yes"; then
16- AC_MSG_CHECKING(for mmap that can map /dev/zero)
17- AC_TRY_RUN([
18-#include <sys/types.h>
19-#include <sys/stat.h>
20-#include <fcntl.h>
21-#ifdef HAVE_SYS_MMAN_H
22-#include <sys/mman.h>
23-#endif
24- int main()
25- {
26- int fd;
27- void *m;
28- fd = open("/dev/zero", O_RDWR);
29- if (fd < 0) {
30- return 1;
31- }
32- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
33- if (m == (void *)-1) { /* aka MAP_FAILED */
34- return 2;
35- }
36- if (munmap(m, sizeof(void*)) < 0) {
37- return 3;
38- }
39- return 0;
40- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
41-
42- AC_MSG_RESULT($ac_cv_file__dev_zero)
43-fi
44
45 # Now we determine which one is our anonymous shmem preference.
46 haveshmgetanon="0"
47@@ -1518,13 +1485,14 @@ else
48 bigendian=0
49 fi
50
51-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
52-#include <sys/uio.h>],struct iovec,0)
53-if test "$ac_cv_sizeof_struct_iovec" = "0"; then
54- have_iovec=0
55-else
56- have_iovec=1
57-fi
58+#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
59+##include <sys/uio.h>],struct iovec,0)
60+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then
61+# have_iovec=0
62+#else
63+# have_iovec=1
64+#fi
65+have_iovec=1
66
67 AC_SUBST(voidp_size)
68 AC_SUBST(short_value)
diff --git a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
deleted file mode 100644
index 16499f5ac9..0000000000
--- a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Makefile.in: fix cross compiling failed
2
3The tools/gen_test_char was invoked at build time,
4and it didn't work for the cross compiling, so we
5compile it with $BUILD_CC.
6
7Remove the 'tools' dir creation, it always existed.
8And it caused gen_test_char unexpected rebuilt at
9do_install time.
10
11Upstream-Status: Inappropriate [oe specific]
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 Makefile.in | 10 ++--------
16 1 file changed, 2 insertions(+), 8 deletions(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index a2a5194..5fe028f 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
23
24 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
25 build/apr_rules.out tools/gen_test_char@EXEEXT@ \
26- tools/gen_test_char.o tools/gen_test_char.lo \
27 include/private/apr_escape_test_char.h
28 DISTCLEAN_TARGETS = config.cache config.log config.status \
29 include/apr.h include/arch/unix/apr_private.h \
30@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
31 etags:
32 etags `find . -name '*.[ch]'`
33
34-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
35-tools/gen_test_char.lo: tools/gen_test_char.c
36- $(APR_MKDIR) tools
37- $(LT_COMPILE)
38-
39-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
40- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
41+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
42+ $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
43
44 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
45 $(APR_MKDIR) include/private
diff --git a/meta/recipes-support/apr/apr_1.6.2.bb b/meta/recipes-support/apr/apr_1.6.3.bb
index e2eed53c9e..87b878723b 100644
--- a/meta/recipes-support/apr/apr_1.6.2.bb
+++ b/meta/recipes-support/apr/apr_1.6.3.bb
@@ -10,19 +10,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
10BBCLASSEXTEND = "native nativesdk" 10BBCLASSEXTEND = "native nativesdk"
11 11
12SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
13 file://configure_fixes.patch \
14 file://cleanup.patch \
15 file://configfix.patch \
16 file://run-ptest \ 13 file://run-ptest \
17 file://upgrade-and-fix-1.5.1.patch \ 14 file://0001-build-buildcheck.sh-improve-libtool-detection.patch \
18 file://Fix-packet-discards-HTTP-redirect.patch \ 15 file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
19 file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ 16 file://0003-Makefile.in-configure.in-support-cross-compiling.patch \
20 file://0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ 17 file://0004-Fix-packet-discards-HTTP-redirect.patch \
21 file://0002-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ 18 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
19 file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
22" 21"
23 22
24SRC_URI[md5sum] = "e81a851967c79b5ce9bfbc909e4bf735" 23SRC_URI[md5sum] = "12f2a349483ad6f12db49ba01fbfdbfa"
25SRC_URI[sha256sum] = "09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd" 24SRC_URI[sha256sum] = "131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172"
26 25
27inherit autotools-brokensep lib_package binconfig multilib_header ptest 26inherit autotools-brokensep lib_package binconfig multilib_header ptest
28 27
@@ -35,6 +34,9 @@ CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes"
35# 34#
36CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" 35CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no"
37 36
37CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes"
38CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes"
39
38# Otherwise libtool fails to compile apr-utils 40# Otherwise libtool fails to compile apr-utils
39# x86_64-linux-libtool: compile: unable to infer tagged configuration 41# x86_64-linux-libtool: compile: unable to infer tagged configuration
40# x86_64-linux-libtool: error: specify a tag with '--tag' 42# x86_64-linux-libtool: error: specify a tag with '--tag'
@@ -50,7 +52,7 @@ do_configure_prepend() {
50 export GREP="grep" 52 export GREP="grep"
51 53
52 cd ${S} 54 cd ${S}
53 ./buildconf 55 libtool='${HOST_SYS}-libtool' ./buildconf
54} 56}
55 57
56FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" 58FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
@@ -69,7 +71,8 @@ do_install_append() {
69} 71}
70 72
71do_install_append_class-target() { 73do_install_append_class-target() {
72 sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk 74 sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \
75 -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
73 sed -i -e 's,${STAGING_DIR_HOST},,g' \ 76 sed -i -e 's,${STAGING_DIR_HOST},,g' \
74 -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ 77 -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \
75 -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config 78 -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 20:02:39 +0000