There is a race condition in the makefile that can result in build failures like
this in parallel builds:
| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
Fix the rules to stop this happening.
(From OE-Core rev: 97ccd2b841c9dc598dbe39162f335bcde48a7c26)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch from upstream to fix skipped tests, essential for gdk-pixbuf to
pass without enabling all loaders.
(From OE-Core rev: 4bf996557409b63c2d783f175c6325c966aae236)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the tests are enabled then configure will check for the presence DBus. It's
generally present through the runtime dependencies so this often succeeds but as
it isn't a build dependency it's possible for DBus to be present at configure
time but removed at compile time, resulting in build failures.
(From OE-Core rev: 0150e86a7609579cf26f5ef5c6c69b521340218e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The mappedfile ptest was attempting to write into directories that may not exist
on a non-Sato image. Instead, write into TMPDIR.
(From OE-Core rev: 93b4ecc263947826421d5b4fb1f99fe506b24287)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This test was attempting to connect to a session bus and hanging if it couldn't.
Take a patch from upstream to correctly use a private bus.
[ YOCTO #5696 ]
(From OE-Core rev: 12e30b653899567312a7ec29b6e972c85ba8e25e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some of the GLib tests that we run under ptest are missing runtime dependencies.
iochannel-test needs the EUC-JP encoding.
convert needs the ISO-8859-1 and ISO-8859-15 encodings.
contenttype needs shared-mime-info.
Add these to the RDEPENDS so that these tests pass.
[ YOCTO #5696 ]
(From OE-Core rev: 7b6316093ab28782edd45084d43dbd5c309be7c8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The uclibc configuration requires the gnu libiconv, so tell configure which one to use
[YOCTO #5431] (one of many)
(From OE-Core rev: a90b32d63c8a816462b42a33851e4e5e6041bbca)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit 38b6c4df7c215ed7fd6be107fbc2527e66791e2e.
Its not needed anymore after upgrade to 2.38
(From OE-Core rev: 3efd8530053cf54e3f0b0fc6a96272fdb2ee27ba)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The .bb was getting larger with configuration being arbitarily split between .bb
and .inc. To help adding a glib_git recipe, strip the .bb down to SRC_URI.
Also don't remove $libdir/gio as it should be owned by glib.
(From OE-Core rev: 55b950500fd9d944042e3c2b0872685f0a60e8eb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop the ptest patches and instead use --enable-installed-tests, updating
run-ptest to invoke gnome-desktop-testing-runner.
Drop the x32 build patch, upstream has integrated a similar fix.
(From OE-Core rev: 33bb8d5da050519043bb913bae4f5692bbd899ad)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With buildtools (which contains Python) installed on a build machine,
glib-2.0's gtester-report script was ending up with the full path to
the installed python binary in the shebang, which when rpm packaging
was used led to this being added as a per-file dependency by rpmdeps for
the libglib-2.0-utils package in which it ends up. This of course broke
do_rootfs when the package was included in the rootfs and had been
restored from sstate from another machine, as happened on the Yocto
Project autobuilder.
We were already trying to sed this script apparently only for the
shebang (since it appears that there are no other paths in the script)
so let's just sed the shebang properly; it also seems sensible to do
this for native as well instead of explicitly trying to exclude that
case.
Fixes [YOCTO #5205].
(From OE-Core rev: 1d16e8035dda062041394b1e51839a9a7d077cf5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We will see the following warning by accident:
$ bitbake nativesdk-glib-2.0
WARNING: QA Issue: nativesdk-glib-2.0-dbg: found library in wrong location:
/opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/share/gdb/auto-load/opt/
poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/libglib-2.0.so.0.3600.4-gdb.py
There are two '/opt/poky/0.5.5/sysroots' in the path when the warning
comes, this is what we need since glib-2.0 has done this intentionally
in its configure and Makefile.
This is because the configure script uses the:
ABS_GLIB_RUNTIME_LIBDIR = "readlink -f $libdir/$with_runtime_libdir`"
to figure out the abs dir, so if
/opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/ exists , there
would be warning, otherwise no warning.
We can change the "readlink -f" to "readlink -m" to fix the host
contamination issue.
Another fix could be:
ABS_GLIB_RUNTIME_LIBDIR =""
But this is much more like a workaround.
[YOCTO #5099]
(From OE-Core rev: 3e660ec01cc62c57b379b151e43c7952e97a1c2b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We use GNU libiconv seprate package on uclibc
specifying this makes the configure clear of not
trying to detect glibc/iconv and then also finding
libiconv in sysroot and confusing itself with errors like
| gconvert.c:66:2: error: #error GNU libiconv not in use but included iconv.h is from libiconv
| #error GNU libiconv not in use but included iconv.h is from libiconv
| ^
(From OE-Core rev: 38b6c4df7c215ed7fd6be107fbc2527e66791e2e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
glib configure will check if current gcc need -march=i486,
when gcc need -march=i486 but CFLAGS don't have,
glib configure will abort and advise the user to add -march=i486.
This will break the build process,it's not good for automatic build system.
so change this to adding -march=i486 automatically when it is needed.
(From OE-Core rev: fdd523e5a14cacf31dce4dae435267e30dff9222)
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patching a generated file is prone to conflicts, and we'll be replacing this
file anyway when configuring, so drop the Makefile.in hunks.
(From OE-Core rev: a3fa323c4d24375be9b783281c3cf31c0707ecb7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch was build- (gcc 4.7.2/4.8.0) and run-tested with my standard
xfce-/gnome2-images
(From OE-Core rev: f4f5d41f6cd262379daa8a00699a64f0df6fd9e7)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since 2.20 the use of argparse was removed, so we don't need these dependencies
anymore.
(From OE-Core rev: 2a6067f6e69c8f2d04b8cf7e4a97e5085f758654)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove automake patch that is now correctly supported upstream
Codegen files have moved to glib-2.0, so correct packaging and
removal.
(From OE-Core rev: 0d13d9947262b09cd69bc526ea2738e50c658744)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this, glib will probe for the existence of xsltproc and use that
to decide whether or not it wants to generate manpages. This has two
consequences, neither of them good:
a) the result of the build will vary depending on whether xsltproc
happens to be installed in either the native sysroot or the host
environment; and
b) if xsltproc does happen to be installed but docbook-xsl isn't, the
build will fail with "I/O error" messages.
(From OE-Core rev: b2e2c6e1a20ea4c53dea04992bb1b38890a959dd)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without disabling the tests in the native build, glib-2.0-native will need
libdbus-native to be present. As we don't run the tests, disable them so we
don't have build failures due to missing dependencies.
Also, the LSB override was missing PTEST_CONF so the same problem could happen.
After adding PTEST_CONF the LSB override is identical to the non-overridden
EXTRA_OECONF, so remove it.
Finally, to be explicit, put --enable-module-tests in PTEST_CONF.
(From OE-Core rev: 395b90054eccddc1c9062a9a8657ed4482b7710a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Only install eglibc-specific dependencies when building for eglibc.
Tweak a test case that won't build with uclibc.
(From OE-Core rev: e28e04e26893416d577ee54e03019c03865e1bf6)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This improves reusabiliy of sstate-cache across different hosts
(From OE-Core rev: 4c223e2b2ba552b832b51c9071f003de67493c27)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
(From OE-Core rev: fd05a7137082517947ba5af32d2b80a9beaa4ad7)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replaced incorrect "startline" with correct "beginline" for telling
where license segment in file begins. Old md5sum was calculated from
the beginning of the file, not from beginning of the license segment.
(From OE-Core rev: a6e2e5b592747a7e4a8465c8637154555ee020c8)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also explicitly disable the test suite (as we can't run it), subsequently
dropping 60_wait-longer-for-threads-to-die.patch and nodbus.patch.
nolibelf.patch has been merged upstream, drop.
Upstream has dropped the pre-generated man pages, to generate them again we'd
need libxslt and the DocBook infrastructure. We can live without the man pages
as those build-dependencies are non-trivial.
(From OE-Core rev: ce5fcad59fff19dbffc2d7b49c0c8bf3701d17ed)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This dependency mysteriously appeared a long time ago for no good reason, remove
it.
(From OE-Core rev: 5e2fdfcbe71f0b6a786ef609e288c0999000e163)
Signed-off-by: Ross Burton <ross.burton@intel.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.
[YOCTO #3297]
(From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338)
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>
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
GLib will use "minimal" debugging on non-development builds and the extra safety
net and ability to debug at all is totally worth the small performance cost.
If someone has a need for every ounce of performance, a simple .bbappend can
restore this option.
(From OE-Core rev: 4337545ea05ec9d9f64244bb6be83fab329478d1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
when we build for nativesdk it needs tools from installed
glib-2.0-dev package. We zeroes out compile_resourses but
then genmarshal came up so instead of going about disabling
them one by one lets depend on glib-2.0-native since
thats the right thing to do.
(From OE-Core rev: 5416bf849ceefb49f06bedfa5e67595e9c68582a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When you have a distro which has older version of
glib-2.0 installed then it does not have compile_resources
installed which essentially glib-2.0 nativesdk is
looking for on build host. So like in a cross build
we disable the configure check which will force it
to build an internal copy and use it.
This problem may not be seen on newer distros like
ubuntu 12.04 since they have newer version of glib-2.0
installed
(From OE-Core rev: 69bd94173294c1ae2cf5e300ada7116e99a5b0c7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Many recipes are now having to define PERLPATH and PYTHONPATH variables.
Creating USRBINPATH in bitbake.conf means we can remove all these lines
from the many recipes now needing this and simplify the code changes
needed in each case, reducing the chance of errors being introduced.
Also fixup glib python binary location issue and fix function indentation.
(From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 2.32.4 has completion files in ${datadir}/bash-completion
and dbus also packages bash-competion files in separate package
(From OE-Core rev: b070eb22372ad1ef5b21162d832772e560184cf8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's bugfix release, see http://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.news
for list of fixed bugs
(From OE-Core rev: 85a930188300152bc9a1bbf640a2441f3177e26f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this change, libelf was "floating" for linuxstdbase for example,
leading to build failures. This patch moves all the common options
into a common variable.
(From OE-Core rev: 382bd564d0675bded38459943ab1fe5dbc1e9ee7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
