Was detected in Martin's world build
(From OE-Core rev: ef9dfc361e5e97157d05dfeaf67a3e872648d372)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When subversion run on x86 and lib32 on x86-64, it use the APR's
apr.h header file. But when configure the APR, APR meets the cross
compiling, it was hardcoded in configure.in in apr source code. As
the following:
APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
It pass 8 bytes to off_t when meets cross compiling, but on x86 or lib32
the off_t in glibc was 4 bytes, so it let the application who use apr.h
go to wrong.
Such as subversion:
svnadmin create test
So we should let the APR detect the correct off_t when cross compiling,
change it to the following:
AC_CHECK_SIZEOF(off_t)
The same for the following hardcoded types for cross compiling:
pid_t 8
size_t 8
ssize_t 8
Change the above correspondingly.
(From OE-Core rev: e18820ca9202c07e2406d702c46f45415182b7a6)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add PACKAGECONFIG for ipv6 and control it based
on DISTRO_FEATURES.
(From OE-Core rev: 91d29c5555557fb0637c886f76c859d704ecd980)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed when build nativesdk-apr-util:
| gawk: fatal: can't open source file `/opt/poky/2.0+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/build-1/make_exports.awk' for reading (No such file or directory)
The ${S} should be ${B}.
(From OE-Core rev: ba29845a5b9bf16cda2230540d7ce17d0f82e8fa)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Enable apr-util's cryptographic routines so that the apache2 package
can encrypt session data. Also add sqlite3 and ldap modules, disabled
by default.
(From OE-Core rev: c8be8890e0a9c9d5f1532c4ee4fe9a346ed3ca5b)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A new QA check was introduced by 47d38d4d86ec6a which catches recipes
which install loadable modules (*.so) inside -dev packages instead of
symlinks. Install apr-util's modules into ${PN} and also skip the QA
check [dev-so] because it is the reverse of the check introduced by
47d38d4d86ec6a (thus if a recipe passes one it fails the other).
(From OE-Core rev: ef82fb5aff4ca3204b40cdf6a074d9711e543af2)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When ccache is enabled, libtool requires --tag=CC when use ccache,
otherwise when building apr-util with ccache enabled:
| libtool: compile: unable to infer tagged configuration
| libtool: error: specify a tag with '--tag'
| libtool: compile: unable to infer tagged configuration
| make[1]: *** [buckets/apr_buckets.lo] Error 1
(From OE-Core rev: 52c314963e0ab90e6c1ced7bf66b06d4c304358a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
testxlate test case fails due to dependency on some character-sets.
Install them.
[YOCTO #8171]
(From OE-Core rev: 814b7589ea857806db7e3d2a09cf5f52df5afd76)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If ccache is enabled, compiling apr-utils fails with the following error
messages because libtool is confused by the "ccache gcc" appearing on
the command line. Disable ccache for apr, so that ccache don't get
enabled in all software using apr's rules.mk.
The error message from apr-utils-native:
(From OE-Core rev: 3533552050d0f91b669c6939755c5f6efefa9d58)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cleanup buildpaths from apu-1-config:
- remove ${STAGING_DIR_HOST} from CC, CPP ...
- set APU_SOURCE_DIR, APU_BUILD_DIR as empty
(From OE-Core rev: d61e73a37f805fd56efda1a6cfe7262356fc6274)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cleanup buildpaths from apr_rules.mk and apr-1-config:
- remove ${STAGING_DIR_HOST} from CC, CPP ...
- set APR_SOURCE_DIR, APR_BUILD_DIR as empty
* install ${HOST_SYS}-libtool to sysroot only, it's required for
building apache2 but not suitable for target.
(From OE-Core rev: 44c1a6af03ce9b45e5bfd6956062aa2b3a1be741)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disconnect the connection by poll() timeout.
If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then
apr_socket_recv() returns EAGAIN.
(From OE-Core rev: cef4de5cd6c12091146dc1ef02cd80e094c6728e)
Signed-off-by: Noriaki Yoshitane <yoshitane.nrs@cnt.ncos.nec.co.jp>
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updated upgrade-and-fix-1.5.1.patch.
(From OE-Core rev: 49dd0b1ae91bd869c55ec3bd22bda1bdd4815088)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds 'nativesdk' in the BBCLASSEXTEND.
Building apr-util for the SDK requires that some paths in the rules.mk
file are fixed to point to the actual enviroment. These include pointing
the apr configuration variables to the actual apr builddir and
correcting the name of the libtool.
(From OE-Core rev: 4595e4832418afc651300c88ad2b835f0aedd8bc)
Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds 'nativesdk' in the BBCLASSEXTEND.
(From OE-Core rev: de17201509d16210ead076f0e11d30593d65df25)
Signed-off-by: Timo Mueller <timo.mueller@bmw-carit.de>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
And bump PR to avoid:
x86_64-linux-libtool: error: 'dbm/apr_dbm_gdbm.la' is not a valid libtool archive
(From OE-Core rev: e712a31287eb830f365df456e68bc95bdacb1a4a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The apr provides usr/share/build-1/libtool which is required by
the recipe such as apache2, and it will find grep on the host
and set absolute paths in libtool: GREP="/usr/bin/grep"
If we build apr/apr-native on a host that grep is in "/usr/bin/grep",
and re-use the sstate on another host with "/bin/grep", it will fail
when build apache2/apache2-native with:
| tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
| tmp/sysroots/intel-x86-64/usr/share/build-1/libtool: line 1093: /usr/bin/grep: No such file or directory
(From OE-Core rev: 475709fc4f32e1ed01f45ee44819cd24e739eb43)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The apr-native provides usr/share/build-1/libtool which is required by
the recipe such as apache2-native. If we don't set the CONFIG_SHELL to
/bin/bash, then:
1) If we build apr-native on a host which is "/bin/sh -> bash", the
interpreter in usr/share/build-1/libtool would be "#!/bin/sh".
2) When we re-use apr-native's sstate on a host which is
"/bin/sh -> dash", there would be errors.
(From OE-Core rev: 38d83009dfe77437533969ce681605a9ab9534ac)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bashsim in apr-dev/usr/share/build-1/libtool:
possible bashism in apr-dev/usr/share/build-1/libtool line 1004 ($RANDOM):
my_tmpdir="${my_template}-${RANDOM-0}$$"
possible bashism in apr-dev/usr/share/build-1/libtool line 3797 (should be '.', not 'source'):
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
possible bashism in apr-dev/usr/share/build-1/libtool line 8237 (shopt):
test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
possible bashism in apr-dev/usr/share/build-1/libtool line 8240 (shopt):
shopt -s nocaseglob
possible bashism in apr-dev/usr/share/build-1/libtool line 9255 (should be VAR="${VAR}foo"):
rpath+=" $flag"
(From OE-Core rev: c9bf36cfd577a77f505b72d22144e5a6d608c129)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
If we let configure look for sctp.h it might find it
on the host, so suppress the search with two cached
config variables.
(From OE-Core rev: 4aa6616661cc7a0eda4e9ba3e82a22472b444595)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
While multible hosts sharing a common sstate cache, the fist host using
bash as default shell and build apr, the second host using dash as
default shell and build apr-util, there was a failure in apr-util:
...
| /bin/sh: 0: Can't open i586-poky-linux-libtool
| make[1]: *** [dbm/apr_dbm_gdbm.lo] Error 127
| make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory
`tmp/work/i586-poky-linux/apr-util/1.5.2-r0/apr-util-1.5.2'
...
The quick way to reproduce the defect in Ubuntu 1204:
1. Create a new build
2. sudo dpkg-reconfigure dash <set bash as /bin/sh>
3. bitbake apr
4. sudo dpkg-reconfigure dash <set dash as /bin/sh>
5. bitbake apr-util
Remove the use of $(SHELL) in the apr could avoid this issue.
(From OE-Core rev: 53af71200b6f6d117e1e7dc2e7a7d21c6faab8f9)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Install apr-util test suite and run it as ptest.
(From OE-Core rev: d132900b04a48193f05c04a77c324aa927970328)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Install apr test suite and run it as ptest.
(From OE-Core rev: d8cfe2ce6d45a375449dc3a7370516b8473b0996)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Working with the meta-ros project we detected that the ROS nodes didn't launch properly
the reason was that by default apr_cv_mutex_recursive in apr is set to no and this leads
to the APRENOTIMPL return value of apr_thread_mutex_create in thread_mutex.c when
APR_THREAD_MUTEX_NESTED is requested via flags.
Added CACHED_CONFIGUREVARS += "apr_cv_mutex_recursive=yes" to sources/openembedded-core/meta/recipes-support/apr/apr_1.4.6.bb
to fix this issue. It has also been removed the mention of this variable in
meta/site/powerpc32-linux.
(From OE-Core rev: 20b9151f877978c086dcc8cbae7e0d9c9e89a45d)
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The hardcoded paths in libtool will cause apache2 compile fail at
link stage when the package apr is installed from sstate cache, so
add libtool to SSTATE_SCAN_FILES.
[ CQID: WIND00405372 ]
(From OE-Core rev: 9d590d714c67ffcf1cd3f3844f5b102f72c2d006)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.
[YOCTO #3297]
(From OE-Core rev: cafb550fe9034754933f1708446dde155dcc3d51)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building target packages, it used to be enought to check for PN == BPN, however
with the multilib configurations, this can lead to subtle errors. Change instances
of PN == BPN, to ${CLASSOVERRIDE} == 'class-target'.
(From OE-Core rev: acc988272b4e74a9ad1e6da5af5b2d208584197b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The copying for rules.mk was happened in do_configure_prepend, but it will be
replaced by the one generated by configure, in which APR_MKEXPORT points to
the workdir of apr and cause compile filure when the workdir of apr is removed.
So change the copying in _prepend to _append.
[YOCTO #2947]
(From OE-Core rev: d6aa123fdbfa82c07e33a9b4c7aacad821184790)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If cross-compiling, apr's configure script assumes that pid_t is
64-bit which is wrong - it appears that 32-bit is a safe assumption
for Linux no matter what the architecture, so use that instead by
default.
This fixes Apache writing garbage to its pid file when built using apr
produced from this recipe.
(From OE-Core rev: 81eb71736a4d14abe85d810f9862d8a9421e9ef5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
apr will use libuuid if it is present, and thus we should require that
it is there so that we have a deterministic build.
(From OE-Core rev: b880cebf503ca13cd4fcb741895e57e6353065be)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building apache with this version of apr would blow up on the results
from:
apr_config --apr-libtool
Errors of the form:
/bin/sh: /media/large/tmp/sysroots/x86_64-linux/usr/share/build-1/libtool: No such file or directory
Fix that by ensuring libtool from apr's build lands in
.../usr/share/build-1/.
(From OE-Core rev: eefbc2f219571dd0c66e1099ea4ad72b1a973fd4)
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is done because of this change in gdbm:
"gdbm: Package compat libs in gdbm-compat"
(From OE-Core rev: b91d8a07f736b7698650d25609245c89e0ed73d5)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Andreas Müller
Peter Kjellerstedt
Dengke Du
Jackie Huang
Robert Yang
Ioan-Adrian Ratiu
Ross Burton
Richard Purdie
Maxin B. John
Dmitry Eremin-Solenikov
Wenzong Fan
Li Wang
Timo Mueller
Hongxu Jia
Joe Slater
Chong Lu
Paul Eggleton
Radu Moisan
victor
Mark Hatle
Joe MacDonald
Andrei Gherzan
Shane Wang
Martin Jansa
Saul Wold
Zhai Edwin