[OE-core] [PATCH 16/30] glib-2.0/glib.inc: Handle packaging .dll and .exe files for mingw32

Nathan Rossi nathan at nathanrossi.com
Mon Jan 16 14:15:10 UTC 2017


Handle the packaging of .dll files into the ${PN} package, this is
required due to the mingw/windows convention where .dll's are shipped in
the bindir.

Wildcard the suffix of '*gio-querymodules' so that the .exe versions are
also included in the ${PN} package.

Also handle the packaging of only .exe files into the ${PN}-utils
package. As mentioned above, bindir includes more than just binary
executables.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 24b31a7f9f..4ed2808d0f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -52,9 +52,11 @@ do_configure_prepend() {
 }
 
 FILES_${PN} = "${libdir}/lib*${SOLIBS} \
+               ${bindir}/lib*.dll \
                ${libdir}/gio \
-               ${libexecdir}/*gio-querymodules \
-               ${datadir}/glib-2.0/schemas"
+               ${libexecdir}/*gio-querymodules* \
+               ${datadir}/glib-2.0/schemas \
+               "
 FILES_${PN}-dev += "${libdir}/glib-2.0/include \
                     ${libdir}/gio/modules/lib*${SOLIBSDEV} \
                     ${libdir}/gio/modules/*.la \
@@ -69,6 +71,7 @@ FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
 FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \
                        ${bindir}/gdbus-codegen"
 FILES_${PN}-utils = "${bindir}/*"
+FILES_${PN}-utils_mingw32 = "${bindir}/*.exe"
 
 ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
-- 
2.11.0




More information about the Openembedded-core mailing list