diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-05-27 16:28:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-06 09:26:04 +0100 |
commit | 22ff50f3cb5e5ad11c83d19dbd4e89cc7faee729 (patch) | |
tree | 9bfd8c716abb9b371e704692fa709a26802741c8 /meta/recipes-support/apr/apr | |
parent | cc86e8b9ac0fa03d5dd7561c5f2cef533beef087 (diff) | |
download | poky-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/apr/apr')
-rw-r--r-- | meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch | 48 |
1 files changed, 48 insertions, 0 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 @@ | |||
1 | Makefile.in: fix cross compiling failed | ||
2 | |||
3 | The tools/gen_test_char was invoked at build time, | ||
4 | and it didn't work for the cross compiling, so we | ||
5 | compile it with $BUILD_CC. | ||
6 | |||
7 | Remove the 'tools' dir creation, it always existed. | ||
8 | And it caused gen_test_char unexpected rebuilt at | ||
9 | do_install time. | ||
10 | |||
11 | Upstream-Status: inappropriate [oe specific] | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | --- | ||
15 | Makefile.in | 10 ++-------- | ||
16 | 1 file changed, 2 insertions(+), 8 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.in b/Makefile.in | ||
19 | index 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 | -- | ||
47 | 1.8.1.2 | ||
48 | |||