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_1.5.1.bb | |
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_1.5.1.bb')
-rw-r--r-- | meta/recipes-support/apr/apr_1.5.1.bb | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/meta/recipes-support/apr/apr_1.5.1.bb new file mode 100644 index 0000000000..2720b523f3 --- /dev/null +++ b/meta/recipes-support/apr/apr_1.5.1.bb | |||
@@ -0,0 +1,87 @@ | |||
1 | SUMMARY = "Apache Portable Runtime (APR) library" | ||
2 | HOMEPAGE = "http://apr.apache.org/" | ||
3 | SECTION = "libs" | ||
4 | DEPENDS = "util-linux" | ||
5 | |||
6 | LICENSE = "Apache-2.0" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ | ||
8 | file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
11 | |||
12 | SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | ||
13 | file://configure_fixes.patch \ | ||
14 | file://cleanup.patch \ | ||
15 | file://configfix.patch \ | ||
16 | file://run-ptest \ | ||
17 | file://upgrade-and-fix-1.5.1.patch \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" | ||
21 | SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac" | ||
22 | |||
23 | inherit autotools-brokensep lib_package binconfig multilib_header ptest | ||
24 | |||
25 | OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" | ||
26 | |||
27 | # Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928 | ||
28 | CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" | ||
29 | |||
30 | # Also suppress trying to use sctp. | ||
31 | # | ||
32 | CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no" | ||
33 | |||
34 | do_configure_prepend() { | ||
35 | cd ${S} | ||
36 | ./buildconf | ||
37 | } | ||
38 | |||
39 | FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" | ||
40 | |||
41 | #for some reason, build/libtool.m4 handled by buildconf still be overwritten | ||
42 | #when autoconf, so handle it again. | ||
43 | do_configure_append() { | ||
44 | sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4 | ||
45 | sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk | ||
46 | } | ||
47 | |||
48 | do_install_append() { | ||
49 | oe_multilib_header apr.h | ||
50 | install -d ${D}${datadir}/apr | ||
51 | cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool | ||
52 | } | ||
53 | |||
54 | SSTATE_SCAN_FILES += "apr_rules.mk libtool" | ||
55 | |||
56 | SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" | ||
57 | |||
58 | apr_sysroot_preprocess () { | ||
59 | d=${SYSROOT_DESTDIR}${datadir}/apr | ||
60 | install -d $d/ | ||
61 | cp ${S}/build/apr_rules.mk $d/ | ||
62 | sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk | ||
63 | sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk | ||
64 | sed -i s,LIBTOOL=.*,LIBTOOL=${HOST_SYS}-libtool,g $d/apr_rules.mk | ||
65 | sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk | ||
66 | cp ${S}/build/mkdir.sh $d/ | ||
67 | cp ${S}/build/make_exports.awk $d/ | ||
68 | cp ${S}/build/make_var_export.awk $d/ | ||
69 | } | ||
70 | |||
71 | do_compile_ptest() { | ||
72 | cd ${S}/test | ||
73 | oe_runmake | ||
74 | } | ||
75 | |||
76 | do_install_ptest() { | ||
77 | t=${D}${PTEST_PATH}/test | ||
78 | mkdir -p $t/.libs | ||
79 | cp -r ${S}/test/data $t/ | ||
80 | cp -r ${S}/test/.libs/*.so $t/.libs/ | ||
81 | cp ${S}/test/proc_child $t/ | ||
82 | cp ${S}/test/readchild $t/ | ||
83 | cp ${S}/test/sockchild $t/ | ||
84 | cp ${S}/test/sockperf $t/ | ||
85 | cp ${S}/test/testall $t/ | ||
86 | cp ${S}/test/tryread $t/ | ||
87 | } | ||