diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-04 14:28:55 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-05 14:33:57 +0100 |
| commit | 98777950648f4b61f36308c7b1958c2605cf6bae (patch) | |
| tree | 471d0e644dd94af8554ea76097da38d8a0f79b1f | |
| parent | b13184ccccad9e1b6df44283a9a439d305033cef (diff) | |
| download | openembedded-core-contrib-98777950648f4b61f36308c7b1958c2605cf6bae.tar.gz | |
cogl: fix G-I .typelib installation
By default gobject-introspection puts .typelib files into $PN, but the cogl-1.0
recipe doesn't use PN. Installing cogl-1.0 is impossible as libcogl
conflicts/replaces with cogl-1.0 due to a previous upgrade.
Fix this by putting the .typelib files into the right subpackages, and
explicitly setting FILES_${PN} to "" so that nothing accidently ends up in PN.
(From OE-Core rev: c5c47bc30be52e3b70d74cf89d5c68adbbb1a402)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index fc7cffee4b..690ea3b86e 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -61,10 +61,11 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" } +FILES_${PN} = "" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" -FILES_libcogl = "${libdir}/libcogl${SOLIBS}" +FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" -FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" |