summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-05-27 16:28:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 09:26:04 +0100
commit22ff50f3cb5e5ad11c83d19dbd4e89cc7faee729 (patch)
tree9bfd8c716abb9b371e704692fa709a26802741c8 /meta/recipes-support
parentcc86e8b9ac0fa03d5dd7561c5f2cef533beef087 (diff)
downloadpoky-22ff50f3cb5e5ad11c83d19dbd4e89cc7faee729.tar.gz
apr: upgrade to 1.5.1
The LICENSE has no change, except a newline added. Fix 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 }; ... Fix do_install failed: | DEBUG: Executing shell function do_install | NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image install | tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char | make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1' | tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char | tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private | tools/gen_test_char > include/private/apr_escape_test_char.h | /bin/sh: tools/gen_test_char: Permission denied Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time. (From OE-Core rev: b751144ba467b1358af2db8a4c30b8e0644cffa5) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch48
-rw-r--r--meta/recipes-support/apr/apr_1.5.1.bb (renamed from meta/recipes-support/apr/apr_1.4.8.bb)7
2 files changed, 52 insertions, 3 deletions
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
new file mode 100644
index 0000000000..4bca38494b
--- /dev/null
+++ b/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
@@ -0,0 +1,48 @@
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 6f99733..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-make_tools_dir:
35- $(APR_MKDIR) tools
36-
37-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
38-tools/gen_test_char.lo: make_tools_dir
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
46--
471.8.1.2
48
diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.5.1.bb
index 0a77ad786a..2720b523f3 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"
4DEPENDS = "util-linux" 4DEPENDS = "util-linux"
5 5
6LICENSE = "Apache-2.0" 6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ 7LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
8 file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" 8 file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
9 9
10BBCLASSEXTEND = "native" 10BBCLASSEXTEND = "native"
@@ -14,10 +14,11 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
14 file://cleanup.patch \ 14 file://cleanup.patch \
15 file://configfix.patch \ 15 file://configfix.patch \
16 file://run-ptest \ 16 file://run-ptest \
17 file://upgrade-and-fix-1.5.1.patch \
17" 18"
18 19
19SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" 20SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
20SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" 21SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac"
21 22
22inherit autotools-brokensep lib_package binconfig multilib_header ptest 23inherit autotools-brokensep lib_package binconfig multilib_header ptest
23 24