aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr_1.4.8.bb
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:20:24 +0100
commitb751144ba467b1358af2db8a4c30b8e0644cffa5 (patch)
tree9fc06350cc8d53a6ce3f47d42cfdc05bce8eb0f0 /meta/recipes-support/apr/apr_1.4.8.bb
parent512ec9fb677d920c813d084b85238f3be86f376f (diff)
downloadopenembedded-core-contrib-b751144ba467b1358af2db8a4c30b8e0644cffa5.tar.gz
openembedded-core-contrib-b751144ba467b1358af2db8a4c30b8e0644cffa5.tar.bz2
openembedded-core-contrib-b751144ba467b1358af2db8a4c30b8e0644cffa5.zip
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. 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.4.8.bb')
-rw-r--r--meta/recipes-support/apr/apr_1.4.8.bb86
1 files changed, 0 insertions, 86 deletions
diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.4.8.bb
deleted file mode 100644
index 0a77ad786a0..00000000000
--- a/meta/recipes-support/apr/apr_1.4.8.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-SUMMARY = "Apache Portable Runtime (APR) library"
-HOMEPAGE = "http://apr.apache.org/"
-SECTION = "libs"
-DEPENDS = "util-linux"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
- file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
- file://configure_fixes.patch \
- file://cleanup.patch \
- file://configfix.patch \
- file://run-ptest \
-"
-
-SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41"
-SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421"
-
-inherit autotools-brokensep lib_package binconfig multilib_header ptest
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-# 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"
-
-# Also suppress trying to use sctp.
-#
-CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sctp_uio_h=no"
-
-do_configure_prepend() {
- cd ${S}
- ./buildconf
-}
-
-FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"
-
-#for some reason, build/libtool.m4 handled by buildconf still be overwritten
-#when autoconf, so handle it again.
-do_configure_append() {
- 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
-}
-
-do_install_append() {
- oe_multilib_header apr.h
- install -d ${D}${datadir}/apr
- cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
-}
-
-SSTATE_SCAN_FILES += "apr_rules.mk libtool"
-
-SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
-
-apr_sysroot_preprocess () {
- d=${SYSROOT_DESTDIR}${datadir}/apr
- 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
- sed -i s,LIBTOOL=.*,LIBTOOL=${HOST_SYS}-libtool,g $d/apr_rules.mk
- 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/
-}
-
-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/
-}