[PATCH 0/3] upgrade: apr to 1.5.1 and apr-utils to 1.5.3

[PATCH 0/3] upgrade: apr to 1.5.1 and apr-utils to 1.5.3

[Hongxu Jia]

The following changes since commit 894df445fa71a170397c6e0b4960a89ef20a4230:

  guile: Update to 2.0.11 version (2014-05-21 19:50:21 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr

Hongxu Jia (3):
  apr: upgrade to 1.5.1
  apr: fix cross compiling failed
  apr-util: upgrade to 1.5.3

 .../apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb}   |  4 +-
 .../apr/apr/fix-cross-compiling-failed.patch       | 46 ++++++++++++++++++++++
 .../apr/{apr_1.4.8.bb => apr_1.5.1.bb}             | 14 +++++--
 3 files changed, 59 insertions(+), 5 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} (93%)
 create mode 100644 meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
 rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (84%)

-- 
1.8.1.2

[PATCH 1/3] apr: upgrade to 1.5.1

[Hongxu Jia]

The LICENSE has no change, except a newline added.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (91%)

diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.5.1.bb
similarity index 91%
rename from meta/recipes-support/apr/apr_1.4.8.bb
rename to meta/recipes-support/apr/apr_1.5.1.bb
index 0a77ad7..7f2d2ca 100644
--- a/meta/recipes-support/apr/apr_1.4.8.bb
+++ b/meta/recipes-support/apr/apr_1.5.1.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 DEPENDS = "util-linux"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
 BBCLASSEXTEND = "native"
@@ -16,8 +16,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41"
-SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421"
+SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
+SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac"
 
 inherit autotools-brokensep lib_package binconfig multilib_header ptest
 
-- 
1.8.1.2

[PATCH 2/3] apr: fix cross compiling failed

[Hongxu Jia]

The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127

The tools/gen_test_char was invoked at build time, and it didn't
work for the cross compiling, so we used the native one to instead.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../apr/apr/fix-cross-compiling-failed.patch       | 46 ++++++++++++++++++++++
 meta/recipes-support/apr/apr_1.5.1.bb              |  8 ++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch

diff --git a/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
new file mode 100644
index 0000000..cd430b3
--- /dev/null
+++ b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
@@ -0,0 +1,46 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+used the native one to instead.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -45,8 +45,7 @@ LT_VERSION = @LT_VERSION@
+ @INCLUDE_OUTPUTS@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+-	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
++	build/apr_rules.out  \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -132,14 +131,9 @@ etags:
+ make_tools_dir:
+ 	$(APR_MKDIR) tools
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+-
+-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
++include/private/apr_escape_test_char.h:
+ 	$(APR_MKDIR) include/private
+-	tools/gen_test_char@EXEEXT@ > $@
++	gen_test_char@EXEEXT@ > $@
+ 
+ LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+ 	    @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
+-- 
+1.8.1.2
+
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb
index 7f2d2ca..80af749 100644
--- a/meta/recipes-support/apr/apr_1.5.1.bb
+++ b/meta/recipes-support/apr/apr_1.5.1.bb
@@ -2,6 +2,7 @@ SUMMARY = "Apache Portable Runtime (APR) library"
 HOMEPAGE = "http://apr.apache.org/"
 SECTION = "libs"
 DEPENDS = "util-linux"
+DEPENDS_class-target = "apr-native"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
@@ -16,6 +17,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://run-ptest \
 "
 
+SRC_URI_append_class-target = " \
+           file://fix-cross-compiling-failed.patch \
+"
 SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
 SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac"
 
@@ -50,6 +54,10 @@ do_install_append() {
 	cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
 }
 
+do_install_append_class-native() {
+    install -m 0755 ${S}/tools/gen_test_char ${D}/${bindir}
+}
+
 SSTATE_SCAN_FILES += "apr_rules.mk libtool"
 
 SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
-- 
1.8.1.2

Re: [PATCH 2/3] apr: fix cross compiling failed

[Burton, Ross]

On 28 May 2014 10:05, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> The tools/gen_test_char was invoked at build time, and it didn't
> work for the cross compiling, so we used the native one to instead.

Building all of libapr natively and installing the extra binary is
wasteful when the binary is trivially compiled natively in the target
build.

Simply add a do_compile_prepend() that uses BUILD_CC and so on to
compile tools/gen_test_char.  As it only uses standard C headers this
is trivial and you won't need to patch the build at all (obviously
test when MACHINE is massively incompatible with the host, ie qemuarm
with x86 host).

Ross

Re: [PATCH 2/3] apr: fix cross compiling failed

[Hongxu Jia]

On 05/28/2014 06:48 PM, Burton, Ross wrote:
> On 28 May 2014 10:05, Hongxu Jia <hongxu.jia@windriver.com> wrote:
>> The tools/gen_test_char was invoked at build time, and it didn't
>> work for the cross compiling, so we used the native one to instead.
> Building all of libapr natively and installing the extra binary is
> wasteful when the binary is trivially compiled natively in the target
> build.
>
> Simply add a do_compile_prepend() that uses BUILD_CC and so on to
> compile tools/gen_test_char.  As it only uses standard C headers this
> is trivial and you won't need to patch the build at all (obviously
> test when MACHINE is massively incompatible with the host, ie qemuarm
> with x86 host).

Sounds reasonable, I will do that in V2.

//Hongxu

> Ross

[PATCH 3/3] apr-util: upgrade to 1.5.3

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} (93%)

diff --git a/meta/recipes-support/apr/apr-util_1.5.2.bb b/meta/recipes-support/apr/apr-util_1.5.3.bb
similarity index 93%
rename from meta/recipes-support/apr/apr-util_1.5.2.bb
rename to meta/recipes-support/apr/apr-util_1.5.3.bb
index 4546b97..063a787 100644
--- a/meta/recipes-support/apr/apr-util_1.5.2.bb
+++ b/meta/recipes-support/apr/apr-util_1.5.3.bb
@@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "eb682cfb8642babba427a4fb391b15e8"
-SRC_URI[sha256sum] = "a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613"
+SRC_URI[md5sum] = "71a11d037240b292f824ba1eb537b4e3"
+SRC_URI[sha256sum] = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--without-odbc \
-- 
1.8.1.2

[PATCH V2 0/3] upgrade: apr to 1.5.1 and apr-utils to 1.5.3

[Hongxu Jia]

Change in apr V2:
- In the target build, use $BUILD_CC to compile tools/gen_test_char rather
  than to invoke the native one.

//Hongxu

The following changes since commit 894df445fa71a170397c6e0b4960a89ef20a4230:

  guile: Update to 2.0.11 version (2014-05-21 19:50:21 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr

Hongxu Jia (3):
  apr: upgrade to 1.5.1
  apr: fix cross compiling failed
  apr-util: upgrade to 1.5.3

 .../apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb}   |  4 +--
 .../apr/apr/fix-cross-compiling-failed.patch       | 41 ++++++++++++++++++++++
 .../apr/{apr_1.4.8.bb => apr_1.5.1.bb}             |  7 ++--
 3 files changed, 47 insertions(+), 5 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} (93%)
 create mode 100644 meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
 rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (89%)

-- 
1.8.1.2

[PATCH 2/3] apr: fix cross compiling failed

[Hongxu Jia]

The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127

The tools/gen_test_char was invoked at build time, and it didn't
work for the cross compiling, so we built it with $BUILD_CC.

To make sure there was no side effect on the change, not adding this
patch, I did the test:

1. Built the native tools/gen_test_char on x86-64 host, and invoke
   it on that host;

2. Built the target tools/gen_test_char which arch was arm, and invoke
   it on the qemuarm;

3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */

static const unsigned char test_char_table[256] = {
    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../apr/apr/fix-cross-compiling-failed.patch       | 41 ++++++++++++++++++++++
 meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch

diff --git a/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
new file mode 100644
index 0000000..9c909ec
--- /dev/null
+++ b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
@@ -0,0 +1,41 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -132,10 +131,9 @@ etags:
+ make_tools_dir:
+ 	$(APR_MKDIR) tools
+ 
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: make_tools_dir
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++	$(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ 	$(APR_MKDIR) include/private
+-- 
+1.8.1.2
+
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb
index 7f2d2ca..95c11d5 100644
--- a/meta/recipes-support/apr/apr_1.5.1.bb
+++ b/meta/recipes-support/apr/apr_1.5.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://cleanup.patch \
            file://configfix.patch \
            file://run-ptest \
+           file://fix-cross-compiling-failed.patch \
 "
 
 SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
-- 
1.8.1.2

Re: [PATCH 2/3] apr: fix cross compiling failed

[Burton, Ross]

To help future bisecting this should be merged with the upgrade patch
into a single upgrade-and-fix patch.

Apart from that the patch looks good, thanks.

Ross

On 30 May 2014 04:27, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> The do_compile failed:
> | tools/gen_test_char > include/private/apr_escape_test_char.h
> | /bin/sh: tools/gen_test_char: No such file or directory
> | make[1]: *** [include/private/apr_escape_test_char.h] Error 127
>
> The tools/gen_test_char was invoked at build time, and it didn't
> work for the cross compiling, so we built it with $BUILD_CC.
>
> To make sure there was no side effect on the change, not adding this
> patch, I did the test:
>
> 1. Built the native tools/gen_test_char on x86-64 host, and invoke
>    it on that host;
>
> 2. Built the target tools/gen_test_char which arch was arm, and invoke
>    it on the qemuarm;
>
> 3. Comparing the results, they were total the same;
> ...
> /* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
>
> static const unsigned char test_char_table[256] = {
>     32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
>     17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
>     55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>     0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
>     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
>     0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
>     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
> };
> ...
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>  .../apr/apr/fix-cross-compiling-failed.patch       | 41 ++++++++++++++++++++++
>  meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
>  2 files changed, 42 insertions(+)
>  create mode 100644 meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
>
> diff --git a/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
> new file mode 100644
> index 0000000..9c909ec
> --- /dev/null
> +++ b/meta/recipes-support/apr/apr/fix-cross-compiling-failed.patch
> @@ -0,0 +1,41 @@
> +Makefile.in: fix cross compiling failed
> +
> +The tools/gen_test_char was invoked at build time,
> +and it didn't work for the cross compiling, so we
> +compile it with $BUILD_CC.
> +
> +Upstream-Status: inappropriate [oe specific]
> +
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +---
> + Makefile.in | 8 +++-----
> + 1 file changed, 3 insertions(+), 5 deletions(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
> +
> + CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
> +       build/apr_rules.out tools/gen_test_char@EXEEXT@ \
> +-      tools/gen_test_char.o tools/gen_test_char.lo \
> +       include/private/apr_escape_test_char.h
> + DISTCLEAN_TARGETS = config.cache config.log config.status \
> +       include/apr.h include/arch/unix/apr_private.h \
> +@@ -132,10 +131,9 @@ etags:
> + make_tools_dir:
> +       $(APR_MKDIR) tools
> +
> +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
> +-tools/gen_test_char.lo: make_tools_dir
> +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
> +-      $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
> ++tools/gen_test_char@EXEEXT@: make_tools_dir
> ++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
> ++      $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
> +
> + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
> +       $(APR_MKDIR) include/private
> +--
> +1.8.1.2
> +
> diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb
> index 7f2d2ca..95c11d5 100644
> --- a/meta/recipes-support/apr/apr_1.5.1.bb
> +++ b/meta/recipes-support/apr/apr_1.5.1.bb
> @@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
>             file://cleanup.patch \
>             file://configfix.patch \
>             file://run-ptest \
> +           file://fix-cross-compiling-failed.patch \
>  "
>
>  SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
> --
> 1.8.1.2
>