mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 18:32:12 +02:00
meson: various class improvements
- Ensure that the PACKAGECONFIG arguments are always in EXTRA_OEMESON - Log the arguments that are being passed in do_configure. - Do verbose builds so the compile logs are useful for debugging build problems (From OE-Core rev: 3112ff268d095a65ecb893dd6ca88a85b0f70446) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f2c04b450f
commit
c2ba7177f1
@@ -35,7 +35,7 @@ MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${LDFLAGS}"
|
||||
MESON_HOST_ENDIAN = "bogus-endian"
|
||||
MESON_TARGET_ENDIAN = "bogus-endian"
|
||||
|
||||
EXTRA_OEMESON += "${PACKAGECONFIG_CONFARGS}"
|
||||
EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
MESON_CROSS_FILE = ""
|
||||
MESON_CROSS_FILE_class-target = "--cross-file ${WORKDIR}/meson.cross"
|
||||
@@ -85,6 +85,7 @@ EOF
|
||||
CONFIGURE_FILES = "meson.build"
|
||||
|
||||
meson_do_configure() {
|
||||
bbnote Executing meson ${EXTRA_OEMESON}...
|
||||
if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
|
||||
cat ${B}/meson-logs/meson-log.txt
|
||||
bbfatal_log meson failed
|
||||
@@ -118,11 +119,11 @@ meson_do_configure_prepend_class-native() {
|
||||
|
||||
do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
|
||||
meson_do_compile() {
|
||||
ninja ${PARALLEL_MAKE}
|
||||
ninja -v ${PARALLEL_MAKE}
|
||||
}
|
||||
|
||||
meson_do_install() {
|
||||
DESTDIR='${D}' ninja ${PARALLEL_MAKEINST} install
|
||||
DESTDIR='${D}' ninja -v ${PARALLEL_MAKEINST} install
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
|
||||
Reference in New Issue
Block a user