<div dir="ltr">Yes, that. Thanks very much!<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 2 February 2018 at 09:06, Hongxu Jia <span dir="ltr"><<a href="mailto:hongxu.jia@windriver.com" target="_blank">hongxu.jia@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">1. Improve inappropriate patches:<br>
- Drop inappropriate configure_fixes.patch<br>
Use setting variable ac_cv_file__dev_zero and<br>
ac_cv_sizeof_struct_iovec to replace<br>
<br>
- Drop cleanup.patch<br>
Aassign variable libtool at ./buildconf executing and<br>
use 0001-build-buildcheck.sh-<wbr>improve-libtool-detection.<wbr>patch<br>
to replace. Submitted it to upstream.<br>
<br>
- Rename configfix.patch to<br>
0002-apr-Remove-workdir-path-<wbr>references-from-installed-ap.<wbr>patch<br>
Add its original comments and author, explain why it is inappropriate<br>
<br>
- Drop upgrade-and-fix-1.5.1.patch<br>
Use 0003-Makefile.in-configure.in-<wbr>support-cross-compiling.patch<br>
to replace. And submitted it to upstream.<br>
<br>
2. Fix build path issue to improve reproducibility<br>
<br>
Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
---<br>
...d-buildcheck.sh-improve-<wbr>libtool-detection.patch | 32 ++++++++++<br>
...orkdir-path-references-<wbr>from-installed-ap.patch} | 33 +++++++++--<br>
....in-configure.in-support-<wbr>cross-compiling.patch} | 52 +++++++++++------<br>
...> 0004-Fix-packet-discards-HTTP-<wbr>redirect.patch} | 15 +++--<br>
...-fix-LTFLAGS-to-make-it-<wbr>work-with-ccache.patch} | 12 ++--<br>
...t-size-doesn-t-match-in-<wbr>glibc-when-cross.patch} | 16 ++---<br>
...ink-libapr-against-phtread-<wbr>to-make-gold-.patch} | 12 ++--<br>
meta/recipes-support/apr/apr/<wbr>cleanup.patch | 43 --------------<br>
meta/recipes-support/apr/apr/<wbr>configure_fixes.patch | 68 ----------------------<br>
.../apr/{<a href="http://apr_1.6.2.bb" rel="noreferrer" target="_blank">apr_1.6.2.bb</a> => <a href="http://apr_1.6.3.bb" rel="noreferrer" target="_blank">apr_1.6.3.bb</a>} | 27 +++++----<br>
10 files changed, 140 insertions(+), 170 deletions(-)<br>
create mode 100644 meta/recipes-support/apr/apr/<wbr>0001-build-buildcheck.sh-<wbr>improve-libtool-detection.<wbr>patch<br>
rename meta/recipes-support/apr/apr/{<wbr>configfix.patch => 0002-apr-Remove-workdir-path-<wbr>references-from-installed-ap.<wbr>patch} (67%)<br>
rename meta/recipes-support/apr/apr/{<wbr>upgrade-and-fix-1.5.1.patch => 0003-Makefile.in-configure.in-<wbr>support-cross-compiling.patch} (40%)<br>
rename meta/recipes-support/apr/apr/{<wbr>Fix-packet-discards-HTTP-<wbr>redirect.patch => 0004-Fix-packet-discards-HTTP-<wbr>redirect.patch} (71%)<br>
rename meta/recipes-support/apr/apr/{<wbr>configure.in-fix-LTFLAGS-to-<wbr>make-it-work-with-ccache.patch => 0005-configure.in-fix-LTFLAGS-<wbr>to-make-it-work-with-ccache.<wbr>patch} (78%)<br>
rename meta/recipes-support/apr/apr/{<wbr>0001-apr-fix-off_t-size-doesn-<wbr>t-match-in-glibc-when-cross.<wbr>patch => 0006-apr-fix-off_t-size-doesn-<wbr>t-match-in-glibc-when-cross.<wbr>patch} (85%)<br>
rename meta/recipes-support/apr/apr/{<wbr>0002-explicitly-link-libapr-<wbr>against-phtread-to-make-gold-.<wbr>patch => 0007-explicitly-link-libapr-<wbr>against-phtread-to-make-gold-.<wbr>patch} (90%)<br>
delete mode 100644 meta/recipes-support/apr/apr/<wbr>cleanup.patch<br>
delete mode 100644 meta/recipes-support/apr/apr/<wbr>configure_fixes.patch<br>
rename meta/recipes-support/apr/{<a href="http://apr_1.6.2.bb" rel="noreferrer" target="_blank">apr_<wbr>1.6.2.bb</a> => <a href="http://apr_1.6.3.bb" rel="noreferrer" target="_blank">apr_1.6.3.bb</a>} (77%)<br>
<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/0001-build-buildcheck.sh-<wbr>improve-libtool-detection.<wbr>patch b/meta/recipes-support/apr/<wbr>apr/0001-build-buildcheck.sh-<wbr>improve-libtool-detection.<wbr>patch<br>
new file mode 100644<br>
index 0000000..097c195<br>
--- /dev/null<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0001-build-buildcheck.sh-<wbr>improve-libtool-detection.<wbr>patch<br>
@@ -0,0 +1,32 @@<br>
+From 4efdc06fb17b8a00a9eca923caa176<wbr>be741d1e04 Mon Sep 17 00:00:00 2001<br>
+From: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+Date: Thu, 1 Feb 2018 14:56:13 +0800<br>
+Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection<br>
+<br>
+Support customize libtool by variable assigning, it is helpful<br>
+for cross compileing (such as libtool=aarch64-linux-libtool)<br>
+<br>
+Upstream-Status: Submitted [<a href="https://github.com/apache/apr/pull/8" rel="noreferrer" target="_blank">https://github.com/apache/<wbr>apr/pull/8</a>]<br>
+Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+---<br>
+ build/buildcheck.sh | 4 +++-<br>
+ 1 file changed, 3 insertions(+), 1 deletion(-)<br>
+<br>
+diff --git a/build/buildcheck.sh b/build/buildcheck.sh<br>
+index ab5df44..f191a41 100755<br>
+--- a/build/buildcheck.sh<br>
++++ b/build/buildcheck.sh<br>
+@@ -40,7 +40,9 @@ fi<br>
+ # output is multiline from 1.5 onwards<br>
+<br>
+ # Require libtool 1.4 or newer<br>
+-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`<br>
++if test -z "$libtool"; then<br>
++ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`<br>
++fi<br>
+ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[<wbr>- ].*//g;q'`<br>
+ if test -z "$lt_pversion"; then<br>
+ echo "buildconf: libtool not found."<br>
+--<br>
+1.8.3.1<br>
+<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/configfix.patch b/meta/recipes-support/apr/<wbr>apr/0002-apr-Remove-workdir-<wbr>path-references-from-<wbr>installed-ap.patch<br>
similarity index 67%<br>
rename from meta/recipes-support/apr/apr/<wbr>configfix.patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0002-apr-Remove-workdir-path-<wbr>references-from-installed-ap.<wbr>patch<br>
index 605c4f6..72e706f 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/configfix.patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0002-apr-Remove-workdir-<wbr>path-references-from-<wbr>installed-ap.patch<br>
@@ -1,10 +1,28 @@<br>
+From 5925b20da8bbc34d9bf5a5dca123ef<wbr>38864d43c6 Mon Sep 17 00:00:00 2001<br>
+From: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+Date: Tue, 30 Jan 2018 09:39:06 +0800<br>
+Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr<br>
+ files<br>
+<br>
Upstream-Status: Inappropriate [configuration]<br>
<br>
-Index: apr-1.3.3/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
-=============================<wbr>==============================<wbr>========<br>
---- apr-1.3.3.orig/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a> 2009-01-12 15:16:31.000000000 +0000<br>
-+++ apr-1.3.3/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a> 2009-01-12 15:19:25.000000000 +0000<br>
-@@ -152,14 +152,7 @@<br>
+Signed-off-by: Richard Purdie <<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@<wbr>linuxfoundation.org</a>><br>
+<br>
+The generated `apr-1-config' is used by other recipes at build time or<br>
+packages at target run time, the workdir path caused confusion.<br>
+<br>
+Rebase to 1.6.3<br>
+<br>
+Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+---<br>
+ <a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a> | 26 ++------------------------<br>
+ 1 file changed, 2 insertions(+), 24 deletions(-)<br>
+<br>
+diff --git a/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a> b/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
+index 84b4073..bbbf651 100644<br>
+--- a/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
++++ b/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
+@@ -152,14 +152,7 @@ while test $# -gt 0; do<br>
flags="$flags $LDFLAGS"<br>
;;<br>
--includes)<br>
@@ -19,7 +37,7 @@ Index: apr-1.3.3/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
;;<br>
--srcdir)<br>
echo $APR_SOURCE_DIR<br>
-@@ -181,29 +167,14 @@<br>
+@@ -181,29 +174,14 @@ while test $# -gt 0; do<br>
exit 0<br>
;;<br>
--link-ld)<br>
@@ -51,3 +69,6 @@ Index: apr-1.3.3/<a href="http://apr-config.in" rel="noreferrer" target="_blank">apr-config.in</a><br>
;;<br>
--shlib-path-var)<br>
echo "$SHLIBPATH_VAR"<br>
+--<br>
+1.8.3.1<br>
+<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/upgrade-and-fix-1.5.1.<wbr>patch b/meta/recipes-support/apr/<wbr>apr/0003-Makefile.in-<wbr>configure.in-support-cross-<wbr>compiling.patch<br>
similarity index 40%<br>
rename from meta/recipes-support/apr/apr/<wbr>upgrade-and-fix-1.5.1.patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0003-Makefile.in-configure.in-<wbr>support-cross-compiling.patch<br>
index 16499f5..4dd53bd 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/upgrade-and-fix-1.5.1.<wbr>patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0003-Makefile.in-<wbr>configure.in-support-cross-<wbr>compiling.patch<br>
@@ -1,45 +1,63 @@<br>
-Makefile.in: fix cross compiling failed<br>
+From d5028c10f156c224475b340cfb1ba0<wbr>25d6797243 Mon Sep 17 00:00:00 2001<br>
+From: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+Date: Fri, 2 Feb 2018 15:51:42 +0800<br>
+Subject: [PATCH 3/7] Makefile.in/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a>: support cross compiling<br>
<br>
-The tools/gen_test_char was invoked at build time,<br>
-and it didn't work for the cross compiling, so we<br>
-compile it with $BUILD_CC.<br>
+While cross compiling, the tools/gen_test_char could not<br>
+be executed at build time, use AX_PROG_CC_FOR_BUILD to<br>
+build native tools/gen_test_char<br>
<br>
-Remove the 'tools' dir creation, it always existed.<br>
-And it caused gen_test_char unexpected rebuilt at<br>
-do_install time.<br>
-<br>
-Upstream-Status: Inappropriate [oe specific]<br>
+Upstream-Status: Submitted [<a href="https://github.com/apache/apr/pull/8" rel="noreferrer" target="_blank">https://github.com/apache/<wbr>apr/pull/8</a>]<br>
<br>
Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
---<br>
- Makefile.in | 10 ++--------<br>
- 1 file changed, 2 insertions(+), 8 deletions(-)<br>
+ Makefile.in | 10 +++-------<br>
+ <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 3 +++<br>
+ 2 files changed, 6 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/Makefile.in b/Makefile.in<br>
-index a2a5194..5fe028f 100644<br>
+index 5fb760e..8675f90 100644<br>
--- a/Makefile.in<br>
+++ b/Makefile.in<br>
-@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@<br>
+@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@<br>
<br>
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \<br>
build/apr_rules.out tools/gen_test_char@EXEEXT@ \<br>
- tools/gen_test_char.o tools/gen_test_char.lo \<br>
++ tools/gen_test_char.o \<br>
include/private/apr_escape_<wbr>test_char.h<br>
DISTCLEAN_TARGETS = config.cache config.log config.status \<br>
include/apr.h include/arch/unix/apr_private.<wbr>h \<br>
-@@ -129,13 +128,8 @@ check: $(TARGET_LIB)<br>
+@@ -131,13 +131,9 @@ check: $(TARGET_LIB)<br>
etags:<br>
etags `find . -name '*.[ch]'`<br>
<br>
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)<br>
-tools/gen_test_char.lo: tools/gen_test_char.c<br>
-- $(APR_MKDIR) tools<br>
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c<br>
+ $(APR_MKDIR) tools<br>
- $(LT_COMPILE)<br>
-<br>
-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)<br>
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)<br>
-+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c<br>
-+ $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@<br>
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@<br>
<br>
include/private/apr_escape_<wbr>test_char.h: tools/gen_test_char@EXEEXT@<br>
$(APR_MKDIR) include/private<br>
+diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+index 719f331..361120f 100644<br>
+--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
++++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a<br>
+ dnl preload section from invoking the macro to get compiler info.<br>
+ AC_PROG_CC<br>
+<br>
++dnl Check build CC for gen_test_char compiling which is executed at build time.<br>
++AX_PROG_CC_FOR_BUILD<br>
++<br>
+ dnl AC_PROG_SED is only avaliable in recent autoconf versions.<br>
+ dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.<br>
+ ifdef([AC_PROG_SED],<br>
+--<br>
+1.8.3.1<br>
+<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/Fix-packet-discards-HTTP-<wbr>redirect.patch b/meta/recipes-support/apr/<wbr>apr/0004-Fix-packet-discards-<wbr>HTTP-redirect.patch<br>
similarity index 71%<br>
rename from meta/recipes-support/apr/apr/<wbr>Fix-packet-discards-HTTP-<wbr>redirect.patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0004-Fix-packet-discards-HTTP-<wbr>redirect.patch<br>
index 6805b8b..30fc07d 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/Fix-packet-discards-HTTP-<wbr>redirect.patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0004-Fix-packet-discards-<wbr>HTTP-redirect.patch<br>
@@ -1,4 +1,7 @@<br>
-Fix packet discards HTTP redirect.<br>
+From 7925eb1766a00ccee05c6e80b1d34f<wbr>163a04b7b1 Mon Sep 17 00:00:00 2001<br>
+From: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
+Date: Tue, 30 Jan 2018 09:43:34 +0800<br>
+Subject: [PATCH 4/7] Fix packet discards HTTP redirect.<br>
<br>
Disconnect the connection by poll() timeout.<br>
If timeout=0 and apr_wait_for_io_or_timeout()=<wbr>APR_TIMEUP then<br>
@@ -8,12 +11,16 @@ Upstream-Status: Pending<br>
<br>
Signed-off-by: Noriaki Yoshitane <<a href="mailto:yoshitane.nrs@cnt.ncos.nec.co.jp">yoshitane.nrs@cnt.ncos.nec.<wbr>co.jp</a>><br>
Signed-off-by: Li Wang <<a href="mailto:li.wang@windriver.com">li.wang@windriver.com</a>><br>
+<br>
+Rebase to 1.6.3<br>
+<br>
+Signed-off-by: Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com">hongxu.jia@windriver.com</a>><br>
---<br>
- network_io/unix/sendrecv.c | 4 ++++<br>
+ network_io/unix/sendrecv.c | 4 ++++<br>
1 file changed, 4 insertions(+)<br>
<br>
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c<br>
-index c133a26..e8faf15 100644<br>
+index 4c0e0a6..1bdafba 100644<br>
--- a/network_io/unix/sendrecv.c<br>
+++ b/network_io/unix/sendrecv.c<br>
@@ -85,6 +85,10 @@ apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)<br>
@@ -28,5 +35,5 @@ index c133a26..e8faf15 100644<br>
*len = 0;<br>
return arv;<br>
--<br>
-1.7.9.5<br>
+1.8.3.1<br>
<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/configure.in-fix-LTFLAGS-<wbr>to-make-it-work-with-ccache.<wbr>patch b/meta/recipes-support/apr/<wbr>apr/0005-configure.in-fix-<wbr>LTFLAGS-to-make-it-work-with-<wbr>ccache.patch<br>
similarity index 78%<br>
rename from meta/recipes-support/apr/apr/<wbr>configure.in-fix-LTFLAGS-to-<wbr>make-it-work-with-ccache.patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0005-configure.in-fix-LTFLAGS-<wbr>to-make-it-work-with-ccache.<wbr>patch<br>
index 7521eeb..02634e6 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/configure.in-fix-LTFLAGS-<wbr>to-make-it-work-with-ccache.<wbr>patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0005-configure.in-fix-<wbr>LTFLAGS-to-make-it-work-with-<wbr>ccache.patch<br>
@@ -1,7 +1,7 @@<br>
-From d439093aa07a486f559206ac9e5808<wbr>a6a18218cd Mon Sep 17 00:00:00 2001<br>
+From 2e66cece0c3adff92733332111204d<wbr>dc1d730a07 Mon Sep 17 00:00:00 2001<br>
From: Robert Yang <<a href="mailto:liezhi.yang@windriver.com">liezhi.yang@windriver.com</a>><br>
Date: Thu, 19 Nov 2015 18:25:38 -0800<br>
-Subject: [PATCH] <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a>: fix LTFLAGS to make it work with ccache<br>
+Subject: [PATCH 5/7] <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a>: fix LTFLAGS to make it work with ccache<br>
<br>
When ccache is enabled, libtool requires --tag=CC when use ccache,<br>
otherwise when building apr-util with ccache enabled:<br>
@@ -15,14 +15,14 @@ Upstream-Status: Pending<br>
<br>
Signed-off-by: Robert Yang <<a href="mailto:liezhi.yang@windriver.com">liezhi.yang@windriver.com</a>><br>
---<br>
- <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 2 +-<br>
+ <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-index 5a4a988..9d57ae6 100644<br>
+index 361120f..3b10422 100644<br>
--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-@@ -246,7 +246,7 @@ case $host in<br>
+@@ -249,7 +249,7 @@ case $host in<br>
;;<br>
*)<br>
if test "x$LTFLAGS" = "x"; then<br>
@@ -32,5 +32,5 @@ index 5a4a988..9d57ae6 100644<br>
if test "$experimental_libtool" = "yes"; then<br>
# Use a custom-made libtool replacement<br>
--<br>
-1.7.9.5<br>
+1.8.3.1<br>
<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/0001-apr-fix-off_t-size-<wbr>doesn-t-match-in-glibc-when-<wbr>cross.patch b/meta/recipes-support/apr/<wbr>apr/0006-apr-fix-off_t-size-<wbr>doesn-t-match-in-glibc-when-<wbr>cross.patch<br>
similarity index 85%<br>
rename from meta/recipes-support/apr/apr/<wbr>0001-apr-fix-off_t-size-doesn-<wbr>t-match-in-glibc-when-cross.<wbr>patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0006-apr-fix-off_t-size-doesn-<wbr>t-match-in-glibc-when-cross.<wbr>patch<br>
index c5e92ac..5f5e7ea 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/0001-apr-fix-off_t-size-<wbr>doesn-t-match-in-glibc-when-<wbr>cross.patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0006-apr-fix-off_t-size-<wbr>doesn-t-match-in-glibc-when-<wbr>cross.patch<br>
@@ -1,7 +1,7 @@<br>
-From f26e8b88d2c90ed7eb9d4e276412b0<wbr>923c23d10f Mon Sep 17 00:00:00 2001<br>
+From f4d6e45ed5d2ccffd1af4c2ccdf709<wbr>9ba0dce137 Mon Sep 17 00:00:00 2001<br>
From: Dengke Du <<a href="mailto:dengke.du@windriver.com">dengke.du@windriver.com</a>><br>
Date: Wed, 14 Dec 2016 18:13:08 +0800<br>
-Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross<br>
+Subject: [PATCH 6/7] apr: fix off_t size doesn't match in glibc when cross<br>
compiling<br>
<br>
In <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a>, it contains the following:<br>
@@ -34,10 +34,10 @@ Upstream-Status: Pending<br>
1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-index 9d57ae6..5b19940 100644<br>
+index 3b10422..a227e72 100644<br>
--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-@@ -1681,7 +1681,7 @@ else<br>
+@@ -1769,7 +1769,7 @@ else<br>
socklen_t_value="int"<br>
fi<br>
<br>
@@ -46,7 +46,7 @@ index 9d57ae6..5b19940 100644<br>
<br>
if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then<br>
pid_t_fmt='#define APR_PID_T_FMT "hd"'<br>
-@@ -1750,7 +1750,7 @@ APR_CHECK_TYPES_COMPATIBLE(<wbr>ssize_t, long, [ssize_t_fmt="ld"])<br>
+@@ -1838,7 +1838,7 @@ APR_CHECK_TYPES_COMPATIBLE(<wbr>ssize_t, long, [ssize_t_fmt="ld"])<br>
APR_CHECK_TYPES_COMPATIBLE(<wbr>size_t, unsigned int, [size_t_fmt="u"])<br>
APR_CHECK_TYPES_COMPATIBLE(<wbr>size_t, unsigned long, [size_t_fmt="lu"])<br>
<br>
@@ -55,7 +55,7 @@ index 9d57ae6..5b19940 100644<br>
<br>
AC_MSG_CHECKING([which format to use for apr_ssize_t])<br>
if test -n "$ssize_t_fmt"; then<br>
-@@ -1767,7 +1767,7 @@ fi<br>
+@@ -1855,7 +1855,7 @@ fi<br>
<br>
ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""<br>
<br>
@@ -64,7 +64,7 @@ index 9d57ae6..5b19940 100644<br>
<br>
AC_MSG_CHECKING([which format to use for apr_size_t])<br>
if test -n "$size_t_fmt"; then<br>
-@@ -1784,7 +1784,7 @@ fi<br>
+@@ -1872,7 +1872,7 @@ fi<br>
<br>
size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""<br>
<br>
@@ -74,5 +74,5 @@ index 9d57ae6..5b19940 100644<br>
if test "${ac_cv_sizeof_off_t}${apr_<wbr>cv_use_lfs64}" = "4yes"; then<br>
# Enable LFS<br>
--<br>
-2.7.4<br>
+1.8.3.1<br>
<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/0002-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch b/meta/recipes-support/apr/<wbr>apr/0007-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch<br>
similarity index 90%<br>
rename from meta/recipes-support/apr/apr/<wbr>0002-explicitly-link-libapr-<wbr>against-phtread-to-make-gold-.<wbr>patch<br>
rename to meta/recipes-support/apr/apr/<wbr>0007-explicitly-link-libapr-<wbr>against-phtread-to-make-gold-.<wbr>patch<br>
index 7d0dddc..8760b01 100644<br>
--- a/meta/recipes-support/apr/<wbr>apr/0002-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch<br>
+++ b/meta/recipes-support/apr/<wbr>apr/0007-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch<br>
@@ -1,8 +1,8 @@<br>
-From 94d1ca0266a0f9c0446f1299b54f75<wbr>2e87b8a695 Mon Sep 17 00:00:00 2001<br>
+From c6afc4a4a766478cb6aa6b43a50051<wbr>881b6318d7 Mon Sep 17 00:00:00 2001<br>
From: =?UTF-8?q?Andreas=20M=C3=<wbr>BCller?= <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
Date: Fri, 3 Mar 2017 22:24:17 +0100<br>
-Subject: [PATCH] explicitly link libapr against phtread to make gold happy on<br>
- test<br>
+Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy<br>
+ on test<br>
MIME-Version: 1.0<br>
Content-Type: text/plain; charset=UTF-8<br>
Content-Transfer-Encoding: 8bit<br>
@@ -34,10 +34,10 @@ Signed-off-by: Andreas Müller <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
1 file changed, 1 insertion(+)<br>
<br>
diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-index 5b19940..cdf4d58 100644<br>
+index a227e72..cbc0f90 100644<br>
--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-@@ -766,6 +766,7 @@ else<br>
+@@ -784,6 +784,7 @@ else<br>
APR_PTHREADS_CHECK_RESTORE ] )<br>
fi<br>
if test "$pthreadh" = "1"; then<br>
@@ -46,5 +46,5 @@ index 5b19940..cdf4d58 100644<br>
APR_CHECK_PTHREAD_ATTR_<wbr>GETDETACHSTATE_ONE_ARG<br>
APR_CHECK_PTHREAD_RECURSIVE_<wbr>MUTEX<br>
--<br>
-2.9.3<br>
+1.8.3.1<br>
<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/cleanup.patch b/meta/recipes-support/apr/<wbr>apr/cleanup.patch<br>
deleted file mode 100644<br>
index b6784e0..0000000<br>
--- a/meta/recipes-support/apr/<wbr>apr/cleanup.patch<br>
+++ /dev/null<br>
@@ -1,43 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-Index: apr-1.4.2/build/buildcheck.sh<br>
-=============================<wbr>==============================<wbr>========<br>
---- apr-1.4.2.orig/build/<wbr>buildcheck.sh 2009-11-13 08:27:16.000000000 +0800<br>
-+++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800<br>
-@@ -32,35 +32,4 @@<br>
- echo "buildconf: autoconf version $ac_version (ok)"<br>
- fi<br>
-<br>
--# Sample libtool --version outputs:<br>
--# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)<br>
--# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a<br>
--# output is multiline from 1.5 onwards<br>
--<br>
--# Require libtool 1.4 or newer<br>
--libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`<br>
--lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[<wbr>- ].*//g;q'`<br>
--if test -z "$lt_pversion"; then<br>
--echo "buildconf: libtool not found."<br>
--echo " You need libtool version 1.4 or newer installed"<br>
--echo " to build APR from SVN."<br>
--exit 1<br>
--fi<br>
--lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`<br>
--IFS=.; set $lt_version; IFS=' '<br>
--lt_status="good"<br>
--if test "$1" = "1"; then<br>
-- if test "$2" -lt "4"; then<br>
-- lt_status="bad"<br>
-- fi<br>
--fi<br>
--if test $lt_status = "good"; then<br>
-- echo "buildconf: libtool version $lt_pversion (ok)"<br>
-- exit 0<br>
--fi<br>
--<br>
--echo "buildconf: libtool version $lt_pversion found."<br>
--echo " You need libtool version 1.4 or newer installed"<br>
--echo " to build APR from SVN."<br>
--<br>
--exit 1<br>
-+exit 0<br>
diff --git a/meta/recipes-support/apr/<wbr>apr/configure_fixes.patch b/meta/recipes-support/apr/<wbr>apr/configure_fixes.patch<br>
deleted file mode 100644<br>
index 0514000..0000000<br>
--- a/meta/recipes-support/apr/<wbr>apr/configure_fixes.patch<br>
+++ /dev/null<br>
@@ -1,68 +0,0 @@<br>
-Upstream-Status: Inappropriate [configuration]<br>
-<br>
-Index: apr-1.3.3/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-=============================<wbr>==============================<wbr>========<br>
---- apr-1.3.3.orig/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-+++ apr-1.3.3/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
-@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm<br>
- create_area])<br>
-<br>
- APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)<br>
--AC_CHECK_FILE(/dev/zero)<br>
--<br>
--# Not all systems can mmap /dev/zero (such as HP-UX). Check for that.<br>
--if test "$ac_cv_func_mmap" = "yes" &&<br>
-- test "$ac_cv_file__dev_zero" = "yes"; then<br>
-- AC_MSG_CHECKING(for mmap that can map /dev/zero)<br>
-- AC_TRY_RUN([<br>
--#include <sys/types.h><br>
--#include <sys/stat.h><br>
--#include <fcntl.h><br>
--#ifdef HAVE_SYS_MMAN_H<br>
--#include <sys/mman.h><br>
--#endif<br>
-- int main()<br>
-- {<br>
-- int fd;<br>
-- void *m;<br>
-- fd = open("/dev/zero", O_RDWR);<br>
-- if (fd < 0) {<br>
-- return 1;<br>
-- }<br>
-- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);<br>
-- if (m == (void *)-1) { /* aka MAP_FAILED */<br>
-- return 2;<br>
-- }<br>
-- if (munmap(m, sizeof(void*)) < 0) {<br>
-- return 3;<br>
-- }<br>
-- return 0;<br>
-- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])<br>
--<br>
-- AC_MSG_RESULT($ac_cv_file__<wbr>dev_zero)<br>
--fi<br>
-<br>
- # Now we determine which one is our anonymous shmem preference.<br>
- haveshmgetanon="0"<br>
-@@ -1518,13 +1485,14 @@ else<br>
- bigendian=0<br>
- fi<br>
-<br>
--APR_CHECK_SIZEOF_EXTENDED([#<wbr>include <sys/types.h><br>
--#include <sys/uio.h>],struct iovec,0)<br>
--if test "$ac_cv_sizeof_struct_iovec" = "0"; then<br>
-- have_iovec=0<br>
--else<br>
-- have_iovec=1<br>
--fi<br>
-+#APR_CHECK_SIZEOF_EXTENDED([<wbr>#include <sys/types.h><br>
-+##include <sys/uio.h>],struct iovec,0)<br>
-+#if test "$ac_cv_sizeof_struct_iovec" = "0"; then<br>
-+# have_iovec=0<br>
-+#else<br>
-+# have_iovec=1<br>
-+#fi<br>
-+have_iovec=1<br>
-<br>
- AC_SUBST(voidp_size)<br>
- AC_SUBST(short_value)<br>
diff --git a/meta/recipes-support/apr/<a href="http://apr_1.6.2.bb" rel="noreferrer" target="_blank">apr<wbr>_1.6.2.bb</a> b/meta/recipes-support/apr/<a href="http://apr_1.6.3.bb" rel="noreferrer" target="_blank">apr<wbr>_1.6.3.bb</a><br>
similarity index 77%<br>
rename from meta/recipes-support/apr/<a href="http://apr_1.6.2.bb" rel="noreferrer" target="_blank">apr_<wbr>1.6.2.bb</a><br>
rename to meta/recipes-support/apr/<a href="http://apr_1.6.3.bb" rel="noreferrer" target="_blank">apr_<wbr>1.6.3.bb</a><br>
index e2eed53..87b8787 100644<br>
--- a/meta/recipes-support/apr/<a href="http://apr_1.6.2.bb" rel="noreferrer" target="_blank">apr<wbr>_1.6.2.bb</a><br>
+++ b/meta/recipes-support/apr/<a href="http://apr_1.6.3.bb" rel="noreferrer" target="_blank">apr<wbr>_1.6.3.bb</a><br>
@@ -10,19 +10,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=<wbr>4dfd4cd216828c8cae5de5a12f3844<wbr>c8 \<br>
BBCLASSEXTEND = "native nativesdk"<br>
<br>
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-$<wbr>{PV}.tar.bz2 \<br>
- file://configure_fixes.patch \<br>
- file://cleanup.patch \<br>
- file://configfix.patch \<br>
file://run-ptest \<br>
- file://upgrade-and-fix-1.5.1.<wbr>patch \<br>
- file://Fix-packet-discards-<wbr>HTTP-redirect.patch \<br>
- file://configure.in-fix-<wbr>LTFLAGS-to-make-it-work-with-<wbr>ccache.patch \<br>
- file://0001-apr-fix-off_t-<wbr>size-doesn-t-match-in-glibc-<wbr>when-cross.patch \<br>
- file://0002-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch \<br>
+ file://0001-build-buildcheck.<wbr>sh-improve-libtool-detection.<wbr>patch \<br>
+ file://0002-apr-Remove-<wbr>workdir-path-references-from-<wbr>installed-ap.patch \<br>
+ file://0003-Makefile.in-<wbr>configure.in-support-cross-<wbr>compiling.patch \<br>
+ file://0004-Fix-packet-<wbr>discards-HTTP-redirect.patch \<br>
+ file://0005-configure.in-fix-<wbr>LTFLAGS-to-make-it-work-with-<wbr>ccache.patch \<br>
+ file://0006-apr-fix-off_t-<wbr>size-doesn-t-match-in-glibc-<wbr>when-cross.patch \<br>
+ file://0007-explicitly-link-<wbr>libapr-against-phtread-to-<wbr>make-gold-.patch \<br>
"<br>
<br>
-SRC_URI[md5sum] = "<wbr>e81a851967c79b5ce9bfbc909e4bf7<wbr>35"<br>
-SRC_URI[sha256sum] = "<wbr>09109cea377bab0028bba19a92b5b0<wbr>e89603df9eab05c0f7dbd4dd83d48d<wbr>cebd"<br>
+SRC_URI[md5sum] = "<wbr>12f2a349483ad6f12db49ba01fbfdb<wbr>fa"<br>
+SRC_URI[sha256sum] = "<wbr>131f06d16d7aabd097fa992a33eec2<wbr>b6af3962f93e6d570a9bd4d85e9599<wbr>3172"<br>
<br>
inherit autotools-brokensep lib_package binconfig multilib_header ptest<br>
<br>
@@ -35,6 +34,9 @@ CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes"<br>
#<br>
CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=<wbr>no ac_cv_header_netinet_sctp_uio_<wbr>h=no"<br>
<br>
+CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=<wbr>yes"<br>
+CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes"<br>
+<br>
# Otherwise libtool fails to compile apr-utils<br>
# x86_64-linux-libtool: compile: unable to infer tagged configuration<br>
# x86_64-linux-libtool: error: specify a tag with '--tag'<br>
@@ -50,7 +52,7 @@ do_configure_prepend() {<br>
export GREP="grep"<br>
<br>
cd ${S}<br>
- ./buildconf<br>
+ libtool='${HOST_SYS}-libtool' ./buildconf<br>
}<br>
<br>
FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"<br>
@@ -69,7 +71,8 @@ do_install_append() {<br>
}<br>
<br>
do_install_append_class-<wbr>target() {<br>
- sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/<a href="http://apr_rules.mk" rel="noreferrer" target="_blank">apr_<wbr>rules.mk</a><br>
+ sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \<br>
+ -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/<a href="http://apr_rules.mk" rel="noreferrer" target="_blank">apr_<wbr>rules.mk</a><br>
sed -i -e 's,${STAGING_DIR_HOST},,g' \<br>
-e 's,APR_SOURCE_DIR=.*,APR_<wbr>SOURCE_DIR=,g' \<br>
-e 's,APR_BUILD_DIR=.*,APR_BUILD_<wbr>DIR=,g' ${D}${bindir}/apr-1-config<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.8.1<br>
<br>
</font></span></blockquote></div><br></div>