2013-12-19 15:13:01 +00:00
|
|
|
SUMMARY = "Apache Portable Runtime (APR) library"
|
2010-12-17 02:00:20 +00:00
|
|
|
HOMEPAGE = "http://apr.apache.org/"
|
2009-01-07 17:22:15 +00:00
|
|
|
SECTION = "libs"
|
2012-06-30 21:11:24 +00:00
|
|
|
DEPENDS = "util-linux"
|
2010-12-17 02:00:20 +00:00
|
|
|
|
2011-05-25 21:05:02 +00:00
|
|
|
LICENSE = "Apache-2.0"
|
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>
2014-05-27 08:28:51 +00:00
|
|
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
|
2010-12-17 02:00:20 +00:00
|
|
|
file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
|
|
|
|
|
2015-02-02 14:03:07 +00:00
|
|
|
BBCLASSEXTEND = "native nativesdk"
|
2011-10-21 07:58:08 +00:00
|
|
|
|
2011-07-28 13:28:20 +00:00
|
|
|
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
|
2011-07-28 06:33:35 +00:00
|
|
|
file://configure_fixes.patch \
|
|
|
|
file://cleanup.patch \
|
2014-01-14 09:42:39 +00:00
|
|
|
file://configfix.patch \
|
|
|
|
file://run-ptest \
|
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>
2014-05-27 08:28:51 +00:00
|
|
|
file://upgrade-and-fix-1.5.1.patch \
|
2015-07-08 07:53:19 +00:00
|
|
|
file://Fix-packet-discards-HTTP-redirect.patch \
|
2014-01-14 09:42:39 +00:00
|
|
|
"
|
2009-01-07 17:22:15 +00:00
|
|
|
|
2015-05-04 14:26:51 +00:00
|
|
|
SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa"
|
|
|
|
SRC_URI[sha256sum] = "7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a"
|
2010-12-08 04:06:29 +00:00
|
|
|
|
2014-02-27 18:01:44 +00:00
|
|
|
inherit autotools-brokensep lib_package binconfig multilib_header ptest
|
2009-01-07 17:22:15 +00:00
|
|
|
|
|
|
|
OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
|
|
|
|
|
2013-07-03 13:04:25 +00:00
|
|
|
# Added to fix some issues with cmake. Refer to https://github.com/bmwcarit/meta-ros/issues/68#issuecomment-19896928
|
|
|
|
CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes"
|
|
|
|
|
2014-04-18 22:38:35 +00:00
|
|
|
# Also suppress trying to use sctp.
|
|
|
|
#
|
|
|
|
CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no"
|
|
|
|
|
2009-01-07 17:22:15 +00:00
|
|
|
do_configure_prepend() {
|
2014-12-08 06:08:03 +00:00
|
|
|
# Avoid absolute paths for grep since it causes failures
|
|
|
|
# when using sstate between different hosts with different
|
|
|
|
# install paths for grep.
|
|
|
|
export GREP="grep"
|
|
|
|
|
2009-01-07 17:22:15 +00:00
|
|
|
cd ${S}
|
|
|
|
./buildconf
|
|
|
|
}
|
|
|
|
|
2011-07-28 06:33:35 +00:00
|
|
|
FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
|
2014-08-18 06:11:43 +00:00
|
|
|
RDEPENDS_${PN}-dev += "bash"
|
2011-07-28 06:33:35 +00:00
|
|
|
|
2010-12-17 02:00:20 +00:00
|
|
|
#for some reason, build/libtool.m4 handled by buildconf still be overwritten
|
|
|
|
#when autoconf, so handle it again.
|
|
|
|
do_configure_append() {
|
2012-12-14 14:51:17 +00:00
|
|
|
sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4
|
|
|
|
sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk
|
2010-12-17 02:00:20 +00:00
|
|
|
}
|
|
|
|
|
2011-07-26 17:58:58 +00:00
|
|
|
do_install_append() {
|
|
|
|
oe_multilib_header apr.h
|
2012-06-28 18:29:47 +00:00
|
|
|
install -d ${D}${datadir}/apr
|
2015-09-30 07:59:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
do_install_append_class-target() {
|
|
|
|
sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
|
|
|
|
sed -i -e 's,${STAGING_DIR_HOST},,g' \
|
|
|
|
-e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \
|
|
|
|
-e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config
|
2011-07-26 17:58:58 +00:00
|
|
|
}
|
|
|
|
|
2013-03-04 01:34:30 +00:00
|
|
|
SSTATE_SCAN_FILES += "apr_rules.mk libtool"
|
2012-02-23 15:50:26 +00:00
|
|
|
|
2009-11-17 13:56:55 +00:00
|
|
|
SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
|
|
|
|
|
|
|
|
apr_sysroot_preprocess () {
|
2011-01-18 08:17:58 +00:00
|
|
|
d=${SYSROOT_DESTDIR}${datadir}/apr
|
2009-11-17 13:56:55 +00:00
|
|
|
install -d $d/
|
|
|
|
cp ${S}/build/apr_rules.mk $d/
|
|
|
|
sed -i s,apr_builddir=.*,apr_builddir=,g $d/apr_rules.mk
|
|
|
|
sed -i s,apr_builders=.*,apr_builders=,g $d/apr_rules.mk
|
2014-04-11 10:31:38 +00:00
|
|
|
sed -i s,LIBTOOL=.*,LIBTOOL=${HOST_SYS}-libtool,g $d/apr_rules.mk
|
2009-11-17 13:56:55 +00:00
|
|
|
sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g $d/apr_rules.mk
|
|
|
|
cp ${S}/build/mkdir.sh $d/
|
|
|
|
cp ${S}/build/make_exports.awk $d/
|
|
|
|
cp ${S}/build/make_var_export.awk $d/
|
2015-09-30 07:59:23 +00:00
|
|
|
cp ${S}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${datadir}/build-1/libtool
|
2009-01-07 17:22:15 +00:00
|
|
|
}
|
2014-01-14 09:42:39 +00:00
|
|
|
|
|
|
|
do_compile_ptest() {
|
|
|
|
cd ${S}/test
|
|
|
|
oe_runmake
|
|
|
|
}
|
|
|
|
|
|
|
|
do_install_ptest() {
|
|
|
|
t=${D}${PTEST_PATH}/test
|
|
|
|
mkdir -p $t/.libs
|
|
|
|
cp -r ${S}/test/data $t/
|
|
|
|
cp -r ${S}/test/.libs/*.so $t/.libs/
|
|
|
|
cp ${S}/test/proc_child $t/
|
|
|
|
cp ${S}/test/readchild $t/
|
|
|
|
cp ${S}/test/sockchild $t/
|
|
|
|
cp ${S}/test/sockperf $t/
|
|
|
|
cp ${S}/test/testall $t/
|
|
|
|
cp ${S}/test/tryread $t/
|
|
|
|
}
|
2014-11-10 03:37:41 +00:00
|
|
|
|
|
|
|
export CONFIG_SHELL="/bin/bash"
|