diff options
author | Jérémy Rosen <jeremy.rosen@smile.fr> | 2016-09-07 11:08:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 15:27:05 +0100 |
commit | 0458275013964626b6d3680afbec334c253e788b (patch) | |
tree | afcf2b0eadf9c455df9575bd8125437156a542dc | |
parent | 6f60d91adcd01f1338e62bc70004b6407f4ecd3f (diff) | |
download | poky-0458275013964626b6d3680afbec334c253e788b.tar.gz |
rpm: manually cleanup sysck
version 5.4.1 of rpm was not properly distclean before release, which
causes problems when cross-compiling.
The previous version this recipe called make distclean, but that would
trigger a call to ./configure which would fail when no gcc is
available and make the whole do_configure fail further down the line
This patch manually removes the files from the recipe.
(From OE-Core rev: 6c9f61233f64356291a0c42761a833f3b151114c)
(From OE-Core rev: 66dd4d3abb708376fbfbf37cab1ef1f2dee2049b)
Signed-off-by: Jérémy Rosen <jeremy.rosen@smile.fr>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.16.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 2ffb3aa5cd..71ebace730 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb | |||
@@ -527,7 +527,7 @@ do_configure() { | |||
527 | sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \ | 527 | sed -e 's/pkg-config --exists uuid/pkg-config --exists ossp-uuid/g' \ |
528 | -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure | 528 | -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i ${S}/configure |
529 | 529 | ||
530 | ( cd ${S}/syck ; set +e ; rm -- -l* ; make distclean ) || : | 530 | ( cd ${S}/syck ; set +e ; rm -- -l* ; rm Makefile config.h config.status lib/Makefile libtool stamp-h1 tests/.deps tests/Makefile ) || : |
531 | 531 | ||
532 | export varprefix=${localstatedir} | 532 | export varprefix=${localstatedir} |
533 | oe_runconf | 533 | oe_runconf |