mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

cogl: fix G-I .typelib installation

Browse Source 
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>
This commit is contained in:
Ross Burton
2016-04-04 14:28:55 +01:00
committed by Richard Purdie
parent b13184cccc
commit 9877795064
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/cogl/cogl-1.0.inc
+3 -2
View File
@@ -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}"