<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 06/04/2014 01:59 PM, Hongxu Jia
wrote:<br>
</div>
<blockquote cite="mid:538EB5DD.6020203@windriver.com" type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<div class="moz-cite-prefix">On 06/04/2014 01:49 PM, Saul Wold
wrote:<br>
</div>
<blockquote cite="mid:538EB35A.3060608@intel.com" type="cite">On
06/03/2014 08:27 PM, Hongxu Jia wrote: <br>
<blockquote type="cite">The do_compile failed: <br>
| tools/gen_test_char >
include/private/apr_escape_test_char.h <br>
| /bin/sh: tools/gen_test_char: No such file or directory <br>
| make[1]: *** [include/private/apr_escape_test_char.h] Error
127 <br>
<br>
The tools/gen_test_char was invoked at build time, and it
didn't <br>
work for the cross compiling, so we built it with $BUILD_CC. <br>
<br>
To make sure there was no side effect on the change, not
adding this <br>
patch, I did the test: <br>
<br>
1. Built the native tools/gen_test_char on x86-64 host, and
invoke <br>
it on that host; <br>
<br>
2. Built the target tools/gen_test_char which arch was arm,
and invoke <br>
it on the qemuarm; <br>
<br>
3. Comparing the results, they were total the same; <br>
... <br>
/* this file is automatically generated by gen_test_char, do
not edit. "make include/private/apr_escape_test_char.h" to
regenerate. */ <br>
<br>
static const unsigned char test_char_table[256] = { <br>
32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17, <br>
17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23, <br>
55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, <br>
0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0, <br>
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, <br>
0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
<br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, <br>
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 <br>
}; <br>
... <br>
<br>
The do_install failed: <br>
| DEBUG: Executing shell function do_install <br>
| NOTE: make -j 16
DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image <br>
install <br>
|
tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh
tools <br>
| gcc
-isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/
<br>
build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe <br>
tools/gen_test_char.c -o tools/gen_test_char <br>
| make[1]: Entering directory
`tmp/work/x86_64-linux/apr-native/1.5.1-r0/ <br>
apr-1.5.1' <br>
|
tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh
tools <br>
| gcc
-isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/
<br>
build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe <br>
tools/gen_test_char.c -o tools/gen_test_char <br>
|
tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh
<br>
include/private <br>
| tools/gen_test_char >
include/private/apr_escape_test_char.h <br>
| /bin/sh: tools/gen_test_char: Permission denied <br>
<br>
Remove the 'tools' dir creation, it always existed. And it
caused <br>
gen_test_char unexpected rebuilt at do_install time. <br>
<br>
Signed-off-by: Hongxu Jia <a moz-do-not-send="true"
class="moz-txt-link-rfc2396E"
href="mailto:hongxu.jia@windriver.com"><hongxu.jia@windriver.com></a>
<br>
--- <br>
meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48
++++++++++++++++++++++ <br>
meta/recipes-support/apr/apr_1.5.1.bb | 1 + <br>
2 files changed, 49 insertions(+) <br>
create mode 100644
meta/recipes-support/apr/apr/upgrade-and-fix.patch <br>
<br>
</blockquote>
<br>
Why not combine this with the 1.5.1 update so they are together?
<br>
<br>
Sau! <br>
<br>
</blockquote>
<br>
Update:<br>
<pre wrap=""> git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr">http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr</a>
</pre>
</blockquote>
<br>
Combine with the 1.5.1 update<br>
<br>
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
<a
href="http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=hongxu/upgrade-apr&id=4e2741183ccf72be080ab009a3488f08561a77e2">http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=hongxu/upgrade-apr&id=4e2741183ccf72be080ab009a3488f08561a77e2</a><br>
<br>
//Hongxu<br>
<br>
<blockquote cite="mid:538EB5DD.6020203@windriver.com" type="cite">
<pre wrap="">
</pre>
-rw-r--r--
meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch 48
<br>
-rw-r--r-- meta/recipes-support/apr/apr_1.5.1.bb 1 <br>
<br>
//Hongxu<br>
<br>
<br>
<blockquote cite="mid:538EB35A.3060608@intel.com" type="cite">
<blockquote type="cite">diff --git
a/meta/recipes-support/apr/apr/upgrade-and-fix.patch
b/meta/recipes-support/apr/apr/upgrade-and-fix.patch <br>
new file mode 100644 <br>
index 0000000..4bca384 <br>
--- /dev/null <br>
+++ b/meta/recipes-support/apr/apr/upgrade-and-fix.patch <br>
@@ -0,0 +1,48 @@ <br>
+Makefile.in: fix cross compiling failed <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>
+ <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>
+ <br>
+Signed-off-by: Hongxu Jia <a moz-do-not-send="true"
class="moz-txt-link-rfc2396E"
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>
+ <br>
+diff --git a/Makefile.in b/Makefile.in <br>
+index 6f99733..5fe028f 100644 <br>
+--- a/Makefile.in <br>
++++ b/Makefile.in <br>
+@@ -46,7 +46,6 @@ 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>
+ include/private/apr_escape_test_char.h <br>
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
<br>
+ include/apr.h include/arch/unix/apr_private.h \ <br>
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB) <br>
+ etags: <br>
+ etags `find . -name '*.[ch]'` <br>
+ <br>
+-make_tools_dir: <br>
+- $(APR_MKDIR) tools <br>
+- <br>
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
<br>
+-tools/gen_test_char.lo: make_tools_dir <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>
+ <br>
+ include/private/apr_escape_test_char.h:
tools/gen_test_char@EXEEXT@ <br>
+ $(APR_MKDIR) include/private <br>
+-- <br>
+1.8.1.2 <br>
+ <br>
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb
b/meta/recipes-support/apr/apr_1.5.1.bb <br>
index 7f2d2ca..8c77af2 100644 <br>
--- a/meta/recipes-support/apr/apr_1.5.1.bb <br>
+++ b/meta/recipes-support/apr/apr_1.5.1.bb <br>
@@ -14,6 +14,7 @@ SRC_URI =
"${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ <br>
<a moz-do-not-send="true"
class="moz-txt-link-freetext" href="file://cleanup.patch">file://cleanup.patch</a>
\ <br>
<a moz-do-not-send="true"
class="moz-txt-link-freetext" href="file://configfix.patch">file://configfix.patch</a>
\ <br>
<a moz-do-not-send="true"
class="moz-txt-link-freetext" href="file://run-ptest">file://run-ptest</a>
\ <br>
+ <a moz-do-not-send="true"
class="moz-txt-link-freetext"
href="file://upgrade-and-fix.patch">file://upgrade-and-fix.patch</a>
\ <br>
" <br>
<br>
SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" <br>
<br>
</blockquote>
<br>
</blockquote>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
</blockquote>
<br>
</body>
</html>