diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-19 00:18:26 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 17:24:48 +0000 |
| commit | dbe91a3d6aebb09d2618a955d09bcbd8ee2baff2 (patch) | |
| tree | 173c73fdbd556c921041f52ab3b203214e65b835 /meta/lib | |
| parent | e7bedb91a7114dda22a97b57de6e98d7794d8a1e (diff) | |
| download | poky-dbe91a3d6aebb09d2618a955d09bcbd8ee2baff2.tar.gz | |
recipetool: create: improve extraction of pkg-config / lib deps
* The regexes for PKG_CHECK_MODULES / AC_CHECK_LIB were a bit too strict
and thus we were skipping some macros.
* Add support for PKG_CHECK_EXISTS
* Avoid duplicates in warning on missing pkg-config dependencies
* Ignore dependency on musl (since this may come up if it's the selected
C library)
(From OE-Core rev: c58669fb0977f7f0cb79f252484d5c5ef0dfb7e4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/recipetool.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index 4103a88fad..927da73e6f 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py | |||
| @@ -383,7 +383,7 @@ class RecipetoolTests(RecipetoolBase): | |||
| 383 | @testcase(1194) | 383 | @testcase(1194) |
| 384 | def test_recipetool_create_git(self): | 384 | def test_recipetool_create_git(self): |
| 385 | # Ensure we have the right data in shlibs/pkgdata | 385 | # Ensure we have the right data in shlibs/pkgdata |
| 386 | bitbake('libpng pango libx11 libxext jpeg') | 386 | bitbake('libpng pango libx11 libxext jpeg libxsettings-client libcheck') |
| 387 | # Try adding a recipe | 387 | # Try adding a recipe |
| 388 | tempsrc = os.path.join(self.tempdir, 'srctree') | 388 | tempsrc = os.path.join(self.tempdir, 'srctree') |
| 389 | os.makedirs(tempsrc) | 389 | os.makedirs(tempsrc) |
| @@ -397,7 +397,7 @@ class RecipetoolTests(RecipetoolBase): | |||
| 397 | checkvars['S'] = '${WORKDIR}/git' | 397 | checkvars['S'] = '${WORKDIR}/git' |
| 398 | checkvars['PV'] = '1.11+git${SRCPV}' | 398 | checkvars['PV'] = '1.11+git${SRCPV}' |
| 399 | checkvars['SRC_URI'] = srcuri | 399 | checkvars['SRC_URI'] = srcuri |
| 400 | checkvars['DEPENDS'] = set(['libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango']) | 400 | checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxsettings-client', 'libxext', 'pango']) |
| 401 | inherits = ['autotools', 'pkgconfig'] | 401 | inherits = ['autotools', 'pkgconfig'] |
| 402 | self._test_recipe_contents(recipefile, checkvars, inherits) | 402 | self._test_recipe_contents(recipefile, checkvars, inherits) |
| 403 | 403 | ||
