* [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI"
@ 2021-05-10 13:01 Alexander Kanavin
2021-05-10 13:01 ` [PATCH 2/8] gdk-pixbuf: rewrite the cross-build support for tests Alexander Kanavin
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This reverts commit 4118415d4bc6243c98a1440195826be7cbad24f1.
This was found to be unnecessary, and broke upstream version checks.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/go/go-common.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index c368b95b69..39a681a712 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -14,7 +14,7 @@ LICENSE = "BSD-3-Clause"
inherit goarch
-SRC_URI = "https://dl.google.com/go/go${PV}.src.tar.gz;name=main"
+SRC_URI = "https://golang.org/dl/go${PV}.src.tar.gz;name=main"
S = "${WORKDIR}/go"
B = "${S}"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/8] gdk-pixbuf: rewrite the cross-build support for tests
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-10 13:01 ` [PATCH 3/8] expat: upgrade 2.2.10 -> 2.3.0 Alexander Kanavin
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
It was scattered over four different patches, and wasn't guarded
by a configuration option. Hopefully the new patch is acceptable
to upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-Add-use_prebuilt_tools-option.patch | 140 ++++++++++++++++++
...f-decisions-around-cross-compilation.patch | 38 -----
...bnailer-and-pixdata-cross-compile-fa.patch | 95 ------------
...nd-thumbnailer-cross-compile-failure.patch | 28 ----
...ailer-and-tests-also-in-cross-builds.patch | 29 ----
.../gdk-pixbuf/gdk-pixbuf_2.42.6.bb | 9 +-
6 files changed, 145 insertions(+), 194 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
new file mode 100644
index 0000000000..e6c4e4f5bc
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
@@ -0,0 +1,140 @@
+From 4a4aa5bef894b74b5bd7f2b8ed862527ce2d84ac Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Sat, 8 May 2021 21:58:54 +0200
+Subject: [PATCH] Add use_prebuilt_tools option
+
+This allows using the gdk-pixbuf tools from the host to
+build and install tests in a cross-compile scenarion.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ gdk-pixbuf/meson.build | 11 +++++++++--
+ meson.build | 6 +++---
+ meson_options.txt | 4 ++++
+ tests/meson.build | 2 --
+ thumbnailer/meson.build | 11 ++++++++---
+ 5 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
+index 8b0590b..7331491 100644
+--- a/gdk-pixbuf/meson.build
++++ b/gdk-pixbuf/meson.build
+@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
+ include_directories: [ root_inc, gdk_pixbuf_inc ],
+ c_args: common_cflags + gdk_pixbuf_cflags,
+ install: true)
+- meson.override_find_program(bin_name, bin)
++ if not get_option('use_prebuilt_tools')
++ meson.override_find_program(bin_name, bin)
++ endif
+
+ # Used in tests
+ set_variable(bin_name.underscorify(), bin)
+ endforeach
+
+-if not meson.is_cross_build()
++if get_option('use_prebuilt_tools')
++ gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true)
++ gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true)
++endif
++
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+ # The 'loaders.cache' used for testing, so we don't accidentally
+ # load the installed cache; we always build it by default
+ loaders_cache = custom_target('loaders.cache',
+diff --git a/meson.build b/meson.build
+index 7a1409b..0bc73eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -403,16 +403,16 @@ subdir('gdk-pixbuf')
+ # i18n
+ subdir('po')
+
+-if not meson.is_cross_build()
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+ subdir('tests')
+- subdir('thumbnailer')
+ endif
++subdir('thumbnailer')
+
+ # Documentation
+ build_docs = get_option('gtk_doc') or get_option('docs')
+ subdir('docs')
+
+-if not meson.is_cross_build()
++if not meson.is_cross_build() or get_option('use_prebuilt_tools')
+ meson.add_install_script('build-aux/post-install.py',
+ gdk_pixbuf_bindir,
+ gdk_pixbuf_libdir,
+diff --git a/meson_options.txt b/meson_options.txt
+index 0ee6718..cc29855 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -49,4 +49,8 @@ option('gio_sniffing',
+ description: 'Perform file type detection using GIO (Unused on MacOS and Windows)',
+ type: 'boolean',
+ value: true)
++option('use_prebuilt_tools',
++ description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation',
++ type: 'boolean',
++ value: false)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 7c6cb11..2b61d6e 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@ if enabled_loaders.contains('png') and host_system != 'windows'
+ '@OUTPUT@',
+ ],
+ depends: [
+- gdk_pixbuf_pixdata,
+ loaders_cache,
+ ],
+ )
+@@ -41,7 +40,6 @@ if enabled_loaders.contains('png') and host_system != 'windows'
+ '@OUTPUT@',
+ ],
+ depends: [
+- gdk_pixbuf_pixdata,
+ loaders_cache,
+ ],
+ )
+diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
+index b6a206d..b02b1c2 100644
+--- a/thumbnailer/meson.build
++++ b/thumbnailer/meson.build
+@@ -6,13 +6,20 @@ bin = executable('gdk-pixbuf-thumbnailer',
+ ],
+ dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
+ install: true)
+-meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
++if not get_option('use_prebuilt_tools')
++ meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
++endif
+
+ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
+ 'gdk-pixbuf-print-mime-types.c',
++ install: true,
+ c_args: common_cflags,
+ dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
+
++if get_option('use_prebuilt_tools')
++ gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true)
++endif
++
+ custom_target('thumbnailer',
+ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
+ output: 'gdk-pixbuf-thumbnailer.thumbnailer',
+@@ -26,8 +33,6 @@ custom_target('thumbnailer',
+ '@OUTPUT@',
+ ],
+ depends: [
+- gdk_pixbuf_print_mime_types,
+- gdk_pixbuf_pixdata,
+ loaders_cache,
+ ],
+ install: true,
+--
+2.24.0
+
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
deleted file mode 100644
index e461404918..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 14 Feb 2019 18:06:25 +0100
-Subject: [PATCH] Generate loaders.cache using a native tool when
- cross-compiling
-
-Otherwise meson would attempt to run a target binary.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- gdk-pixbuf/meson.build | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 5cddbec..78c8bd3 100644
---- a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -324,8 +324,16 @@ if not meson.is_cross_build()
- build_by_default: true)
- loaders_dep = declare_dependency(sources: [ loaders_cache ])
- else
-- loaders_cache = []
-- loaders_dep = declare_dependency()
-+ loaders_cache = custom_target('loaders.cache',
-+ output: 'loaders.cache',
-+ capture: true,
-+ command: [
-+ 'gdk-pixbuf-query-loaders',
-+ dynamic_loaders,
-+ ],
-+ depends: dynamic_loaders_dep,
-+ build_by_default: true)
-+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
- endif
-
- pkgconfig = import('pkgconfig')
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
deleted file mode 100644
index 2aa9164750..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From dcaf3106e2cca27f728a8bd26127430500a1136e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 22 Feb 2019 13:22:06 +0100
-Subject: [PATCH] Work-around thumbnailer and pixdata cross-compile failure
-
-Use native gdk-pixbuf-print-mime-types and gdk-pixbuf-pixdata
-when generating the thumbnail metadata and resources.
-
-This works but the mime types will come from native
-loader.cache (which will only contain in-tree loaders), not from the
-target loader.cache.
-
-The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
-
-Upstream-Status: Inappropriate [workaround]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- tests/meson.build | 11 +++++++++--
- thumbnailer/meson.build | 23 ++++++++++++++++++++++-
- 2 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 7c6cb11..07121f1 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -8,13 +8,20 @@ if enabled_loaders.contains('png') and host_system != 'windows'
- # Resources; we cannot use gnome.compile_resources() here, because we need to
- # override the environment in order to use the utilities we just built instead
- # of the system ones
-+
-+ if not meson.is_cross_build()
-+ pixdata_binary = gdk_pixbuf_pixdata.full_path()
-+ else
-+ pixdata_binary = 'gdk-pixbuf-pixdata'
-+ endif
-+
- resources_c = custom_target('resources.c',
- input: 'resources.gresource.xml',
- output: 'resources.c',
- command: [
- gen_resources,
- '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()),
-- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
-+ '--pixdata=@0@'.format(pixdata_binary),
- '--loaders=@0@'.format(loaders_cache.full_path()),
- '--sourcedir=@0@'.format(meson.current_source_dir()),
- '--source',
-@@ -33,7 +40,7 @@ if enabled_loaders.contains('png') and host_system != 'windows'
- command: [
- gen_resources,
- '--glib-compile-resources=@0@'.format(glib_compile_resources.full_path()),
-- '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
-+ '--pixdata=@0@'.format(pixdata_binary),
- '--loaders=@0@'.format(loaders_cache.full_path()),
- '--sourcedir=@0@'.format(meson.current_source_dir()),
- '--header',
-diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
-index 8c741e0..5a3b52a 100644
---- a/thumbnailer/meson.build
-+++ b/thumbnailer/meson.build
-@@ -14,7 +14,27 @@ gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
- install: true,
- dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
-
--custom_target('thumbnailer',
-+if meson.is_cross_build()
-+ custom_target('thumbnailer',
-+ input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
-+ output: 'gdk-pixbuf-thumbnailer.thumbnailer',
-+ command: [
-+ gen_thumbnailer,
-+ '--printer=gdk-pixbuf-print-mime-types',
-+ '--pixdata=@0@'.format(gdk_pixbuf_pixdata.full_path()),
-+ '--loaders=@0@'.format(loaders_cache.full_path()),
-+ '--bindir=@0@'.format(gdk_pixbuf_bindir),
-+ '@INPUT@',
-+ '@OUTPUT@',
-+ ],
-+ depends: [
-+ gdk_pixbuf_print_mime_types,
-+ gdk_pixbuf_pixdata,
-+ ],
-+ install: true,
-+ install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
-+else
-+ custom_target('thumbnailer',
- input: 'gdk-pixbuf-thumbnailer.thumbnailer.in',
- output: 'gdk-pixbuf-thumbnailer.thumbnailer',
- command: [
-@@ -33,3 +53,4 @@ custom_target('thumbnailer',
- ],
- install: true,
- install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
-+endif
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
deleted file mode 100644
index 110b32a490..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8c7ced988def52654946458a3779e383b27f14f7 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 14 Feb 2019 17:56:10 +0100
-Subject: [PATCH] Work-around thumbnailer cross-compile failure
-
-Install gdk-pixbuf-print-mime-types that's needed for thumbnail
-metadata generation.
-
-The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
-
-Upstream-Status: Inappropriate [workaround]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- thumbnailer/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
-index e801144..aaafec8 100644
---- a/thumbnailer/meson.build
-+++ b/thumbnailer/meson.build
-@@ -10,6 +10,7 @@ executable('gdk-pixbuf-thumbnailer',
- gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
- 'gdk-pixbuf-print-mime-types.c',
- c_args: common_cflags,
-+ install: true,
- dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ])
-
- custom_target('thumbnailer',
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
deleted file mode 100644
index cd9f88befc..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d02a8e202d2fe5caf3449683e0ccdf84a482a325 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 5 Jun 2019 14:17:55 +0200
-Subject: [PATCH] Build thumbnailer and tests also in cross builds.
-
-Upstream-Status: Inappropriate [relies on oe-core specific hacks]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 73034d1..d114016 100644
---- a/meson.build
-+++ b/meson.build
-@@ -378,10 +378,8 @@ subdir('gdk-pixbuf')
- # i18n
- subdir('po')
-
--if not meson.is_cross_build()
-- subdir('tests')
-- subdir('thumbnailer')
--endif
-+subdir('tests')
-+subdir('thumbnailer')
-
- # Documentation
- build_docs = get_option('gtk_doc') or get_option('docs')
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
index e28423efd9..f171464f4d 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
@@ -20,10 +20,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://fatal-loader.patch \
- file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
- file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
- file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
- file://0001-Work-around-thumbnailer-and-pixdata-cross-compile-fa.patch \
+ file://0001-Add-use_prebuilt_tools-option.patch \
"
SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
@@ -47,6 +44,10 @@ PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg"
PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff"
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
+EXTRA_OEMESON_class-target = " \
+ -Duse_prebuilt_tools=true \
+"
+
PACKAGES =+ "${PN}-xlib"
# For GIO image type sniffing
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/8] expat: upgrade 2.2.10 -> 2.3.0
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
2021-05-10 13:01 ` [PATCH 2/8] gdk-pixbuf: rewrite the cross-build support for tests Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-10 13:01 ` [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4 Alexander Kanavin
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop 0001-Add-output-of-tests-result.patch
(difficult to rebase). I have verified that ptests
still pass, and print PASS for every test. If they
start failing we can revisit what kind of output would
be beneficial.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-Add-output-of-tests-result.patch | 83 -------------------
meta/recipes-core/expat/expat/run-ptest | 4 +-
.../expat/{expat_2.2.10.bb => expat_2.3.0.bb} | 7 +-
3 files changed, 5 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch
rename meta/recipes-core/expat/{expat_2.2.10.bb => expat_2.3.0.bb} (81%)
diff --git a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch b/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch
deleted file mode 100644
index c5c18ead74..0000000000
--- a/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001
-From: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com>
-Date: Tue, 18 Feb 2020 19:04:55 +0200
-Subject: [PATCH] Add output of tests result
-
-Added console output of testing results in form 'RESULT: TEST_NAME'.
-
-Changed verbose mode of test application set by '-v' ('--verbose')
-argument to CK_NORMAL.
-Added new supported argument '-vv' ('--extra-verbose') that changes
-verbose mode of test application to CK_VERBOSE. Results of each test
-are shown in output only if this mode is set.
-
-Upstream-Status: Denied
-
-This patch changes potentially deprecated feature that shoud be changed
-in upstream. [https://github.com/libexpat/libexpat/issues/382]
-
-Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com>
----
- tests/minicheck.c | 10 +++++++++-
- tests/runtests.c | 4 +++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c
-index a5a1efb..94fa412 100644
---- a/tests/minicheck.c
-+++ b/tests/minicheck.c
-@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) {
- if (tc->setup != NULL) {
- /* setup */
- if (setjmp(env)) {
-+ if (verbosity >= CK_VERBOSE)
-+ printf("SKIP: %s\n", _check_current_function);
- add_failure(runner, verbosity);
- continue;
- }
-@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) {
- }
- /* test */
- if (setjmp(env)) {
-+ if (verbosity >= CK_VERBOSE)
-+ printf("FAIL: %s\n", _check_current_function);
- add_failure(runner, verbosity);
- continue;
- }
-@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) {
-
- /* teardown */
- if (tc->teardown != NULL) {
-- if (setjmp(env)) {
-+ if (setjmp(env)) {
-+ if (verbosity >= CK_VERBOSE)
-+ printf("PASS: %s\n", _check_current_function);
- add_failure(runner, verbosity);
- continue;
- }
- tc->teardown();
- }
-+ if (verbosity >= CK_VERBOSE)
-+ printf("PASS: %s\n", _check_current_function);
- }
- tc = tc->next_tcase;
- }
-diff --git a/tests/runtests.c b/expat/tests/runtests.c
-index 7791fe0..75724e5 100644
---- a/tests/runtests.c
-+++ b/tests/runtests.c
-@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) {
- for (i = 1; i < argc; ++i) {
- char *opt = argv[i];
- if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0)
-- verbosity = CK_VERBOSE;
-+ verbosity = CK_NORMAL;
- else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0)
- verbosity = CK_SILENT;
-+ else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0)
-+ verbosity = CK_VERBOSE;
- else {
- fprintf(stderr, "runtests: unknown option '%s'\n", opt);
- return 2;
---
-2.17.1
diff --git a/meta/recipes-core/expat/expat/run-ptest b/meta/recipes-core/expat/expat/run-ptest
index 1b39cec8e5..59d8ab57e3 100644
--- a/meta/recipes-core/expat/expat/run-ptest
+++ b/meta/recipes-core/expat/expat/run-ptest
@@ -18,6 +18,6 @@ TIME=$(which time)
echo "Architecture: $(uname -m)" > ${output}
echo "Image: $(uname -sr)" >> ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output}
-${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output}
+${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -v" |& tee -a ${output}
+${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -v" |& tee -a ${output}
echo
diff --git a/meta/recipes-core/expat/expat_2.2.10.bb b/meta/recipes-core/expat/expat_2.3.0.bb
similarity index 81%
rename from meta/recipes-core/expat/expat_2.2.10.bb
rename to meta/recipes-core/expat/expat_2.3.0.bb
index fa263775b3..14d2855df3 100644
--- a/meta/recipes-core/expat/expat_2.2.10.bb
+++ b/meta/recipes-core/expat/expat_2.3.0.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9"
SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \
file://libtool-tag.patch \
- file://run-ptest \
- file://0001-Add-output-of-tests-result.patch \
- "
+ file://run-ptest \
+ "
-SRC_URI[sha256sum] = "b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5"
+SRC_URI[sha256sum] = "f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"
EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
2021-05-10 13:01 ` [PATCH 2/8] gdk-pixbuf: rewrite the cross-build support for tests Alexander Kanavin
2021-05-10 13:01 ` [PATCH 3/8] expat: upgrade 2.2.10 -> 2.3.0 Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-10 23:22 ` [OE-core] " Khem Raj
2021-05-10 13:01 ` [PATCH 5/8] powertop: update 2.13 -> 2.14 Alexander Kanavin
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop mips64_cpu_detection.patch as upstream
has changed the code in a way that's difficult
to rebase. I have confirmed that builds on qemumip64 still
work, and the patch does not say clearly what was the
way to reproduce the failure it's aiming to address.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 -------------------
.../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} | 3 +-
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
deleted file mode 100644
index 69429af8f0..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-It will add -mips64r6 and -mips64r2 to cmdline which will
-cause conflicts
-
-in OE we user mips32r2 and mips64r2 for mips arch versions
-so there is no benefit of detecting it automatically by
-poking at tools especially in cross env
-
-Fixes errors like
-
-linking -mnan=2008 module with previous -mnan=legacy modules
-failed to merge target specific data of file
-
--Khem
-Upstream-Status: Inappropriate [OE-Specific]
-
-Index: ffmpeg-3.1.1/configure
-===================================================================
---- ffmpeg-3.1.1.orig/configure
-+++ ffmpeg-3.1.1/configure
-@@ -5220,12 +5220,9 @@ elif enabled mips; then
-
- # Enable minimum ISA based on selected options
- if enabled mips64; then
-- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
- enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
- disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
- else
-- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
-- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
- enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
- disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
- fi
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
similarity index 98%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
index 08be38ca50..19a8e58370 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
@@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
- file://mips64_cpu_detection.patch \
file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
"
-SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
+SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/8] powertop: update 2.13 -> 2.14
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
` (2 preceding siblings ...)
2021-05-10 13:01 ` [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4 Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-10 13:01 ` [PATCH 6/8] mesa: add lmsensors PACKAGECONFIG Alexander Kanavin
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop configure() tweaks, none of them are needed anymore, and particularly
the ncurses tweak was changing the build in a way that is not clear
(and no one remembers why it was there in the first place).
Adjust LDFLAGS as somehow -pthread isn't there --> link failures.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{powertop_2.13.bb => powertop_2.14.bb} | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
rename meta/recipes-kernel/powertop/{powertop_2.13.bb => powertop_2.14.bb} (64%)
diff --git a/meta/recipes-kernel/powertop/powertop_2.13.bb b/meta/recipes-kernel/powertop/powertop_2.14.bb
similarity index 64%
rename from meta/recipes-kernel/powertop/powertop_2.13.bb
rename to meta/recipes-kernel/powertop/powertop_2.14.bb
index 8c7e78fd94..cb7f3c4dc1 100644
--- a/meta/recipes-kernel/powertop/powertop_2.13.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.14.bb
@@ -9,21 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
file://0001-wakeup_xxx.h-include-limits.h.patch \
"
-SRCREV = "184cee06b2d64679bae5f806fe0a218827fdde99"
+SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba"
S = "${WORKDIR}/git"
-inherit autotools gettext pkgconfig bash-completion
+LDFLAGS_append = " -pthread"
-# we do not want libncursesw if we can
-do_configure_prepend() {
- # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
- sed -i -e "s/ncursesw//g" ${S}/configure.ac
- mkdir -p ${B}/src/tuning/
- echo "${PV}" > ${S}/version-long
- echo "${PV}" > ${S}/version-short
- cp ${STAGING_DATADIR}/aclocal/ax_require_defined.m4 ${S}/m4/
-}
+inherit autotools gettext pkgconfig bash-completion
inherit update-alternatives
ALTERNATIVE_${PN} = "powertop"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/8] mesa: add lmsensors PACKAGECONFIG
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
` (3 preceding siblings ...)
2021-05-10 13:01 ` [PATCH 5/8] powertop: update 2.13 -> 2.14 Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-10 13:01 ` [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 Alexander Kanavin
2021-05-10 13:01 ` [PATCH 8/8] gstreamer1.0-plugins-base_1.18.4.bb: backport a patch to fix meson 0.58 builds Alexander Kanavin
6 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/mesa/mesa.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a85f94c75e..4cec1034e4 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -167,6 +167,8 @@ PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
+PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors"
+
# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
` (4 preceding siblings ...)
2021-05-10 13:01 ` [PATCH 6/8] mesa: add lmsensors PACKAGECONFIG Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
2021-05-12 11:26 ` [OE-core] " Lee Chee Yang
2021-05-10 13:01 ` [PATCH 8/8] gstreamer1.0-plugins-base_1.18.4.bb: backport a patch to fix meson 0.58 builds Alexander Kanavin
6 siblings, 1 reply; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Rebase patches; dropped chunks (and cross-prop-default.patch)
have been removed upstream.
Move native-only patches to all-patches, as they're a pain to rebase
separately.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 10 +---
.../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---
...sues-that-arise-when-cross-compiling.patch | 8 +--
...-not-manipulate-the-environment-when.patch | 14 ++---
...pport-building-allarch-recipes-again.patch | 10 ++--
.../meson/meson/0003-native_bindir.patch | 58 +++++--------------
.../meson/meson/cross-prop-default.patch | 23 --------
.../{meson_0.57.2.bb => meson_0.58.0.bb} | 0
...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0
9 files changed, 43 insertions(+), 98 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/cross-prop-default.patch
rename meta/recipes-devtools/meson/{meson_0.57.2.bb => meson_0.58.0.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 10e7d8a1ce..12a48fc992 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -12,16 +12,12 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0003-native_bindir.patch \
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
- file://cross-prop-default.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://gi-target-dep.patch \
+ file://0001-Make-CPU-family-warnings-fatal.patch \
+ file://0002-Support-building-allarch-recipes-again.patch \
"
-SRC_URI[sha256sum] = "3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
-
-SRC_URI_append_class-native = " \
- file://0001-Make-CPU-family-warnings-fatal.patch \
- file://0002-Support-building-allarch-recipes-again.patch \
-"
+SRC_URI[sha256sum] = "f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index 300797f9ee..bcccfabd17 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,34 +1,33 @@
-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 2001
+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH] Make CPU family warnings fatal
+Subject: [PATCH 1/2] Make CPU family warnings fatal
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>
-
---
mesonbuild/envconfig.py | 2 +-
mesonbuild/environment.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index ba35d16..2d3c34c 100644
+index c6a4df3..4d58c91 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
-@@ -262,7 +262,7 @@ class MachineInfo:
+@@ -266,7 +266,7 @@ class MachineInfo:
cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families:
-- mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+- mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new')
+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 756dd81..4d2c2b6 100644
+index fc9b703..eea8345 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'ppc64'
if trial not in known_cpu_families:
@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
return trial
+--
+2.24.0
+
diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
index 471f1500da..ce90e515da 100644
--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
@@ -1,4 +1,4 @@
-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 4 insertions(+)
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index bcf77b9..6a4b472 100644
+index dc2979e..c9ff9bd 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
- args.append('--{}={}'.format(program_name, path))
+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
+ args.append(f'--{program_name}={path}')
if namespace:
args.append('--namespace=' + namespace)
+ gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
index eb0e90dbdd..fdadc6869b 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
@@ -1,4 +1,4 @@
-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 12 deletions(-)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 07be318..b770603 100644
+index 422155b..aaf5844 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
@@ -26,9 +26,9 @@ index 07be318..b770603 100644
-
try:
self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
- mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
- mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
+ mlog.debug(f'Found "{pkg_name}" via pkgconfig lookup in LIBPC ({pkg_libdir})')
+@@ -83,13 +78,6 @@ class PythonDependency(ExternalDependency):
+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir})')
mlog.debug(e)
- if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 07be318..b770603 100644
- else:
- os.environ.pop('PKG_CONFIG_LIBDIR', None)
else:
- mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC ({pkg_libdir}), this is likely due to a relocated python installation')
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index f6175a194c..dcc1ce9c27 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,19 +1,18 @@
-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00 2001
+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
-Subject: [PATCH] Support building allarch recipes again
+Subject: [PATCH 2/2] Support building allarch recipes again
This registers "allarch" as a known CPU family.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
-
---
mesonbuild/envconfig.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 2d3c34c..b9e7908 100644
+index 4d58c91..ff01ad1 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ from pathlib import Path
@@ -24,3 +23,6 @@ index 2d3c34c..b9e7908 100644
'aarch64',
'alpha',
'arc',
+--
+2.24.0
+
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index ed85116c4f..89257b9e05 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00 2001
+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
mesonbuild/dependencies/base.py | 19 +++++++++++--------
- mesonbuild/dependencies/ui.py | 6 +++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
+ 1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index cd77b4b..7e3f338 100644
+index 14380d4..d0c443f 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
-@@ -192,7 +192,7 @@ class Dependency:
+@@ -179,7 +179,7 @@ class Dependency:
def get_exe_args(self, compiler):
return []
- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str:
+ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str:
- raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
+ raise DependencyException(f'{self.name!r} is not a pkgconfig dependency')
def get_configtool_variable(self, variable_name):
-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
return True
return any(d.is_built() for d in self.ext_deps)
@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency')
-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
p, out, err = Popen_safe(cmd, env=env)
rc, out, err = p.returncode, out.strip(), err.strip()
call = ' '.join(cmd)
-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
- env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
- mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
+ if key.startswith('PKG_'):
+ mlog.debug(f'env[{key}]: {value}')
- def _call_pkgbin(self, args, env=None):
+ def _call_pkgbin(self, args, env=None, use_native=False):
# Always copy the environment since we're going to modify it
# with pkg-config variables
if env is None:
-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
targs = tuple(args)
cache = PkgConfigDependency.pkgbin_cache
if (self.pkgbin, targs, fenv) not in cache:
@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
variable = ''
if ret != 0:
if self.required:
-diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index d897d76..a598d2e 100644
---- a/mesonbuild/dependencies/ui.py
-+++ b/mesonbuild/dependencies/ui.py
-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
- self.bindir = self.get_pkgconfig_host_bins(core)
- if not self.bindir:
- # If exec_prefix is not defined, the pkg-config file is broken
-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
-+ prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True)
- if prefix:
- self.bindir = os.path.join(prefix, 'bin')
-
-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
- for application in applications:
- try:
-- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}))
-+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True))
- except MesonException:
- pass
-
-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
-
- def get_pkgconfig_host_bins(self, core):
-- return core.get_pkgconfig_variable('host_bins', {})
-+ return core.get_pkgconfig_variable('host_bins', {}, use_native=True)
-
- def get_private_includes(self, mod_inc_dir, module):
- return _qt_get_private_includes(mod_inc_dir, module, self.version)
diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
deleted file mode 100644
index 772395e879..0000000000
--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-meson.build files that use cc.run() in native builds can silently fallback to
-meson.get_cross_property() in cross builds without an exe-wrapper, but there's
-no way to know that this is happening.
-
-As the defaults may be pessimistic (for example, disabling the support for a
-feature that should be enabled) emit a warning when the default is used, so that
-the recipe can explicitly set the cross property as relevant.
-
-Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5071]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
-index 3c3cfae0..10e741ae 100644
---- a/mesonbuild/interpreter.py
-+++ b/mesonbuild/interpreter.py
-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
- return props[propname]
- except Exception:
- if len(args) == 2:
-+ mlog.warning('Cross property %s is using default value %s' % (propname, args[1]))
- return args[1]
- raise InterpreterException('Unknown cross property: %s.' % propname)
-
diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb b/meta/recipes-devtools/meson/meson_0.58.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.57.2.bb
rename to meta/recipes-devtools/meson/meson_0.58.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 8/8] gstreamer1.0-plugins-base_1.18.4.bb: backport a patch to fix meson 0.58 builds
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
` (5 preceding siblings ...)
2021-05-10 13:01 ` [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 Alexander Kanavin
@ 2021-05-10 13:01 ` Alexander Kanavin
6 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-10 13:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...c91697a141fea7317aff7f0f28e5a861db99.patch | 50 +++++++++++++++++++
.../gstreamer1.0-plugins-base_1.18.4.bb | 1 +
2 files changed, 51 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
new file mode 100644
index 0000000000..a2f5dff5e9
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/4ef5c91697a141fea7317aff7f0f28e5a861db99.patch
@@ -0,0 +1,50 @@
+From 4ef5c91697a141fea7317aff7f0f28e5a861db99 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Mon, 26 Apr 2021 14:25:03 -0400
+Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
+
+"implicit_include_directories: false" now also means that current build
+directory is not added to include paths by default any more. We have to
+add it manually because we have some custom_target() that generate
+headers in current build directory.
+
+See https://github.com/mesonbuild/meson/issues/8700.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1125>
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ gst-libs/gst/gl/meson.build | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index 66668644e..53891625a 100644
+--- a/gst-libs/gst/gl/meson.build
++++ b/gst-libs/gst/gl/meson.build
+@@ -1004,11 +1004,20 @@ if build_gstgl
+ command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
+ gen_sources = [gl_enumtypes_h]
+
++ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
++
++ # We have custom_target() that generate headers in the current build dir,
++ # but with implicit_include_directories: false, meson >= 0.58.0 won't include
++ # it by default. We cannot use include_directories('.') here because it would
++ # also include current source dir which is what we want to avoid because
++ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
++ common_args += '-I@0@'.format(meson.current_build_dir())
++
+ gstgl = library('gstgl-' + api_version,
+ gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
+- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
++ c_args : common_args,
++ cpp_args : common_args,
++ objc_args : common_args + gl_objc_args,
+ include_directories : [configinc, libsinc, gl_includes],
+ version : libversion,
+ soversion : soversion,
+--
+GitLab
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb
index beddfb0386..73b433ab91 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.4.bb
@@ -11,6 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
file://0003-viv-fb-Make-sure-config.h-is-included.patch \
file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
file://0004-glimagesink-Downrank-to-marginal.patch \
+ file://4ef5c91697a141fea7317aff7f0f28e5a861db99.patch \
"
SRC_URI[sha256sum] = "29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323"
--
2.31.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4
2021-05-10 13:01 ` [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4 Alexander Kanavin
@ 2021-05-10 23:22 ` Khem Raj
0 siblings, 0 replies; 13+ messages in thread
From: Khem Raj @ 2021-05-10 23:22 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Mon, May 10, 2021 at 6:01 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop mips64_cpu_detection.patch as upstream
> has changed the code in a way that's difficult
> to rebase. I have confirmed that builds on qemumip64 still
> work, and the patch does not say clearly what was the
> way to reproduce the failure it's aiming to address.
>
this fail on mips see https://errors.yoctoproject.org/Errors/Details/580763/
MACHINE=qemumips bitbake ffmpeg
should reproduce it.
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> .../ffmpeg/ffmpeg/mips64_cpu_detection.patch | 32 -------------------
> .../ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} | 3 +-
> 2 files changed, 1 insertion(+), 34 deletions(-)
> delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
> rename meta/recipes-multimedia/ffmpeg/{ffmpeg_4.3.2.bb => ffmpeg_4.4.bb} (98%)
>
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
> deleted file mode 100644
> index 69429af8f0..0000000000
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -It will add -mips64r6 and -mips64r2 to cmdline which will
> -cause conflicts
> -
> -in OE we user mips32r2 and mips64r2 for mips arch versions
> -so there is no benefit of detecting it automatically by
> -poking at tools especially in cross env
> -
> -Fixes errors like
> -
> -linking -mnan=2008 module with previous -mnan=legacy modules
> -failed to merge target specific data of file
> -
> --Khem
> -Upstream-Status: Inappropriate [OE-Specific]
> -
> -Index: ffmpeg-3.1.1/configure
> -===================================================================
> ---- ffmpeg-3.1.1.orig/configure
> -+++ ffmpeg-3.1.1/configure
> -@@ -5220,12 +5220,9 @@ elif enabled mips; then
> -
> - # Enable minimum ISA based on selected options
> - if enabled mips64; then
> -- enabled mips64r6 && check_inline_asm_flags mips64r6 '"dlsa $0, $0, $0, 1"' '-mips64r6'
> - enabled mips64r2 && check_inline_asm_flags mips64r2 '"dext $0, $0, 0, 1"' '-mips64r2'
> - disabled mips64r6 && disabled mips64r2 && check_inline_asm_flags mips64r1 '"daddi $0, $0, 0"' '-mips64'
> - else
> -- enabled mips32r6 && check_inline_asm_flags mips32r6 '"aui $0, $0, 0"' '-mips32r6'
> -- enabled mips32r5 && check_inline_asm_flags mips32r5 '"eretnc"' '-mips32r5'
> - enabled mips32r2 && check_inline_asm_flags mips32r2 '"ext $0, $0, 0, 1"' '-mips32r2'
> - disabled mips32r6 && disabled mips32r5 && disabled mips32r2 && check_inline_asm_flags mips32r1 '"addi $0, $0, 0"' '-mips32'
> - fi
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
> similarity index 98%
> rename from meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
> rename to meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
> index 08be38ca50..19a8e58370 100644
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.2.bb
> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.4.bb
> @@ -24,10 +24,9 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>
> SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
> - file://mips64_cpu_detection.patch \
> file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
> "
> -SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
> +SRC_URI[sha256sum] = "06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
>
> # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
> ARM_INSTRUCTION_SET_armv4 = "arm"
> --
> 2.31.1
>
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
2021-05-10 13:01 ` [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 Alexander Kanavin
@ 2021-05-12 11:26 ` Lee Chee Yang
2021-05-12 17:03 ` Alexander Kanavin
0 siblings, 1 reply; 13+ messages in thread
From: Lee Chee Yang @ 2021-05-12 11:26 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test
https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio
>-----Original Message-----
>From: openembedded-core@lists.openembedded.org <openembedded-
>core@lists.openembedded.org> On Behalf Of Alexander Kanavin
>Sent: Monday, 10 May, 2021 9:01 PM
>To: openembedded-core@lists.openembedded.org
>Cc: Alexander Kanavin <alex.kanavin@gmail.com>
>Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
>
>Rebase patches; dropped chunks (and cross-prop-default.patch) have been
>removed upstream.
>
>Move native-only patches to all-patches, as they're a pain to rebase
>separately.
>
>Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>---
> meta/recipes-devtools/meson/meson.inc | 10 +---
> .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise-
>when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment-
>when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++--
> .../meson/meson/0003-native_bindir.patch | 58 +++++--------------
> .../meson/meson/cross-prop-default.patch | 23 --------
> .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0
> ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0
> 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644
>meta/recipes-devtools/meson/meson/cross-prop-default.patch
> rename meta/recipes-devtools/meson/{meson_0.57.2.bb =>
>meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-
>meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)
>
>diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
>devtools/meson/meson.inc
>index 10e7d8a1ce..12a48fc992 100644
>--- a/meta/recipes-devtools/meson/meson.inc
>+++ b/meta/recipes-devtools/meson/meson.inc
>@@ -12,16 +12,12 @@ SRC_URI =
>"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-
>${P
> file://0003-native_bindir.patch \
> file://0001-python-module-do-not-manipulate-the-environment-
>when.patch \
> file://disable-rpath-handling.patch \
>- file://cross-prop-default.patch \
> file://0001-modules-python.py-do-not-substitute-python-s-
>install.patch \
> file://gi-target-dep.patch \
>+ file://0001-Make-CPU-family-warnings-fatal.patch \
>+ file://0002-Support-building-allarch-recipes-again.patch \
> "
>-SRC_URI[sha256sum] =
>"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
>-
>-SRC_URI_append_class-native = " \
>- file://0001-Make-CPU-family-warnings-fatal.patch \
>- file://0002-Support-building-allarch-recipes-again.patch \
>-"
>+SRC_URI[sha256sum] =
>"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
>
> UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
>diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-
>CPU-family-warnings-fatal.patch
>index 300797f9ee..bcccfabd17 100644
>--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fatal.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fa
>+++ tal.patch
>@@ -1,34 +1,33 @@
>-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00
>2001
>+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00
>2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Tue, 3 Jul 2018 13:59:09 +0100
>-Subject: [PATCH] Make CPU family warnings fatal
>+Subject: [PATCH 1/2] Make CPU family warnings fatal
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Ross Burton <ross.burton@intel.com>
>-
> ---
> mesonbuild/envconfig.py | 2 +-
> mesonbuild/environment.py | 4 +---
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
>ba35d16..2d3c34c 100644
>+index c6a4df3..4d58c91 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
>-@@ -262,7 +262,7 @@ class MachineInfo:
>+@@ -266,7 +266,7 @@ class MachineInfo:
>
> cpu_family = literal['cpu_family']
> if cpu_family not in known_cpu_families:
>-- mlog.warning('Unknown CPU family {}, please report this at
>https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
>+- mlog.warning(f'Unknown CPU family {cpu_family}, please report this
>at https://github.com/mesonbuild/meson/issues/new')
> + raise EnvironmentException('Unknown CPU family {}, see
>https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for
>directions.'.format(cpu_family))
>
> endian = literal['endian']
> if endian not in ('little', 'big'):
> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -
>index 756dd81..4d2c2b6 100644
>+index fc9b703..eea8345 100644
> --- a/mesonbuild/environment.py
> +++ b/mesonbuild/environment.py
>-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
>str:
>+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
>str:
> trial = 'ppc64'
>
> if trial not in known_cpu_families:
>@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
>
> return trial
>
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-
>that-arise-when-cross-compiling.patch b/meta/recipes-
>devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-
>compiling.patch
>index 471f1500da..ce90e515da 100644
>--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-
>arise-when-cross-compiling.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris
>+++ e-when-cross-compiling.patch
>@@ -1,4 +1,4 @@
>-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
>+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 4 Aug 2017 16:16:41 +0300
> Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -
>20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 1 file changed, 4 insertions(+)
>
> diff --git a/mesonbuild/modules/gnome.py
>b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644
>+index dc2979e..c9ff9bd 100644
> --- a/mesonbuild/modules/gnome.py
> +++ b/mesonbuild/modules/gnome.py
>-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
>- args.append('--{}={}'.format(program_name, path))
>+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
>+ args.append(f'--{program_name}={path}')
> if namespace:
> args.append('--namespace=' + namespace)
> + gtkdoc_exe_wrapper =
>state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
>diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-
>not-manipulate-the-environment-when.patch b/meta/recipes-
>devtools/meson/meson/0001-python-module-do-not-manipulate-the-
>environment-when.patch
>index eb0e90dbdd..fdadc6869b 100644
>--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipulate-the-environment-when.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipu
>+++ late-the-environment-when.patch
>@@ -1,4 +1,4 @@
>-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
>+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Mon, 19 Nov 2018 14:24:26 +0100
> Subject: [PATCH] python module: do not manipulate the environment when
>calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
><alex.kanavin@gmail.com>
> 1 file changed, 12 deletions(-)
>
> diff --git a/mesonbuild/modules/python.py
>b/mesonbuild/modules/python.py -index 07be318..b770603 100644
>+index 422155b..aaf5844 100644
> --- a/mesonbuild/modules/python.py
> +++ b/mesonbuild/modules/python.py
>-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
> old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
>
>@@ -26,9 +26,9 @@ index 07be318..b770603 100644
> -
> try:
> self.pkgdep = PkgConfigDependency(pkg_name, environment,
>kwargs)
>- mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
>({})'.format(pkg_name, pkg_libdir))
>-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
>- mlog.debug('"{}" could not be found in LIBPC
>({})'.format(pkg_name, pkg_libdir))
>+ mlog.debug(f'Found "{pkg_name}" via pkgconfig
>+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class
>PythonDependency(ExternalDependency):
>+ mlog.debug(f'"{pkg_name}" could not be found in
>+LIBPC ({pkg_libdir})')
> mlog.debug(e)
>
> - if old_pkg_path is not None:
>@@ -39,5 +39,5 @@ index 07be318..b770603 100644
> - else:
> - os.environ.pop('PKG_CONFIG_LIBDIR', None)
> else:
>- mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to
>a relocated python installation'.format(pkg_name, pkg_libdir))
>+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC
>+ ({pkg_libdir}), this is likely due to a relocated python
>+ installation')
>
>diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-
>allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
>Support-building-allarch-recipes-again.patch
>index f6175a194c..dcc1ce9c27 100644
>--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
>recipes-again.patch
>+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
>re
>+++ cipes-again.patch
>@@ -1,19 +1,18 @@
>-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00
>2001
>+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00
>2001
> From: Peter Kjellerstedt <pkj@axis.com>
> Date: Thu, 26 Jul 2018 16:32:49 +0200
>-Subject: [PATCH] Support building allarch recipes again
>+Subject: [PATCH 2/2] Support building allarch recipes again
>
> This registers "allarch" as a known CPU family.
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>-
> ---
> mesonbuild/envconfig.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
>2d3c34c..b9e7908 100644
>+index 4d58c91..ff01ad1 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
> @@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index
>2d3c34c..b9e7908 100644
> 'aarch64',
> 'alpha',
> 'arc',
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>index ed85116c4f..89257b9e05 100644
>--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>@@ -1,4 +1,4 @@
>-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00
>2001
>+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
>2001
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> Date: Wed, 15 Nov 2017 15:05:01 +0100
> Subject: [PATCH] native_bindir
>@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado
><ricardo.ribalda@gmail.com>
>
> ---
> mesonbuild/dependencies/base.py | 19 +++++++++++--------
>- mesonbuild/dependencies/ui.py | 6 +++---
>- 2 files changed, 14 insertions(+), 11 deletions(-)
>+ 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/mesonbuild/dependencies/base.py
>b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644
>+index 14380d4..d0c443f 100644
> --- a/mesonbuild/dependencies/base.py
> +++ b/mesonbuild/dependencies/base.py
>-@@ -192,7 +192,7 @@ class Dependency:
>+@@ -179,7 +179,7 @@ class Dependency:
> def get_exe_args(self, compiler):
> return []
>
> - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
>T.Any]) -> str:
> + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
>T.Any], use_native=False) -> str:
>- raise DependencyException('{!r} is not a pkgconfig
>dependency'.format(self.name))
>+ raise DependencyException(f'{self.name!r} is not a pkgconfig
>+ dependency')
>
> def get_configtool_variable(self, variable_name):
>-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
>+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
> return True
> return any(d.is_built() for d in self.ext_deps)
>
>@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
> raise DependencyException('Method "get_pkgconfig_variable()" is '
> 'invalid for an internal dependency')
>
>-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
> return s.format(self.__class__.__name__, self.name, self.is_found,
> self.version_reqs)
>
>@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
> p, out, err = Popen_safe(cmd, env=env)
> rc, out, err = p.returncode, out.strip(), err.strip()
> call = ' '.join(cmd)
>-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
>- env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
>- mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
>+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
>+ if key.startswith('PKG_'):
>+ mlog.debug(f'env[{key}]: {value}')
>
> - def _call_pkgbin(self, args, env=None):
> + def _call_pkgbin(self, args, env=None, use_native=False):
> # Always copy the environment since we're going to modify it
> # with pkg-config variables
> if env is None:
>-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
> targs = tuple(args)
> cache = PkgConfigDependency.pkgbin_cache
> if (self.pkgbin, targs, fenv) not in cache:
>@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
> return cache[(self.pkgbin, targs, fenv)]
>
> def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
>-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
> (self.name, out_raw))
> self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
>
>@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
> options = ['--variable=' + variable_name, self.name]
>
> if 'define_variable' in kwargs:
>-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>
> options = ['--define-variable=' + '='.join(definition)] + options
>
>@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
> variable = ''
> if ret != 0:
> if self.required:
>-diff --git a/mesonbuild/dependencies/ui.py
>b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644
>---- a/mesonbuild/dependencies/ui.py
>-+++ b/mesonbuild/dependencies/ui.py
>-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
>- self.bindir = self.get_pkgconfig_host_bins(core)
>- if not self.bindir:
>- # If exec_prefix is not defined, the pkg-config file is broken
>-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
>-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
>-+ use_native=True)
>- if prefix:
>- self.bindir = os.path.join(prefix, 'bin')
>-
>-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
>- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
>- for application in applications:
>- try:
>-- return os.path.dirname(core.get_pkgconfig_variable('%s_location' %
>application, {}))
>-+ return
>-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' %
>-+ application, {}, use_native=True))
>- except MesonException:
>- pass
>-
>-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
>- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
>-
>- def get_pkgconfig_host_bins(self, core):
>-- return core.get_pkgconfig_variable('host_bins', {})
>-+ return core.get_pkgconfig_variable('host_bins', {},
>-+ use_native=True)
>-
>- def get_private_includes(self, mod_inc_dir, module):
>- return _qt_get_private_includes(mod_inc_dir, module, self.version)
>diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>deleted file mode 100644
>index 772395e879..0000000000
>--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-meson.build files that use cc.run() in native builds can silently fallback to
>-meson.get_cross_property() in cross builds without an exe-wrapper, but
>there's -no way to know that this is happening.
>-
>-As the defaults may be pessimistic (for example, disabling the support for a -
>feature that should be enabled) emit a warning when the default is used, so
>that -the recipe can explicitly set the cross property as relevant.
>-
>-Upstream-Status: Submitted
>[https://github.com/mesonbuild/meson/pull/5071]
>-Signed-off-by: Ross Burton <ross.burton@intel.com>
>-
>-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index
>3c3cfae0..10e741ae 100644
>---- a/mesonbuild/interpreter.py
>-+++ b/mesonbuild/interpreter.py
>-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
>- return props[propname]
>- except Exception:
>- if len(args) == 2:
>-+ mlog.warning('Cross property %s is using default value
>-+ %s' % (propname, args[1]))
>- return args[1]
>- raise InterpreterException('Unknown cross property: %s.' % propname)
>-
>diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb b/meta/recipes-
>devtools/meson/meson_0.58.0.bb
>similarity index 100%
>rename from meta/recipes-devtools/meson/meson_0.57.2.bb
>rename to meta/recipes-devtools/meson/meson_0.58.0.bb
>diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
>b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
>similarity index 100%
>rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
>rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
>--
>2.31.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
2021-05-12 11:26 ` [OE-core] " Lee Chee Yang
@ 2021-05-12 17:03 ` Alexander Kanavin
2021-05-13 5:43 ` Lee Chee Yang
0 siblings, 1 reply; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-12 17:03 UTC (permalink / raw)
To: Lee, Chee Yang; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 20611 bytes --]
Thank you, I will look into it.
Alex
On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <chee.yang.lee@intel.com>
wrote:
> Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio
>
>
>
> >-----Original Message-----
> >From: openembedded-core@lists.openembedded.org <openembedded-
> >core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> >Sent: Monday, 10 May, 2021 9:01 PM
> >To: openembedded-core@lists.openembedded.org
> >Cc: Alexander Kanavin <alex.kanavin@gmail.com>
> >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
> >
> >Rebase patches; dropped chunks (and cross-prop-default.patch) have been
> >removed upstream.
> >
> >Move native-only patches to all-patches, as they're a pain to rebase
> >separately.
> >
> >Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >---
> > meta/recipes-devtools/meson/meson.inc | 10 +---
> > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---
> ...sues-that-arise-
> >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment-
> >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10
> ++--
> > .../meson/meson/0003-native_bindir.patch | 58 +++++--------------
> > .../meson/meson/cross-prop-default.patch | 23 --------
> > .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0
> > ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0
> > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644
> >meta/recipes-devtools/meson/meson/cross-prop-default.patch
> > rename meta/recipes-devtools/meson/{meson_0.57.2.bb =>
> >meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-
> >meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)
> >
> >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> >devtools/meson/meson.inc
> >index 10e7d8a1ce..12a48fc992 100644
> >--- a/meta/recipes-devtools/meson/meson.inc
> >+++ b/meta/recipes-devtools/meson/meson.inc
> >@@ -12,16 +12,12 @@ SRC_URI =
> >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-
> >${P
> > file://0003-native_bindir.patch \
> > file://0001-python-module-do-not-manipulate-the-environment-
> >when.patch \
> > file://disable-rpath-handling.patch \
> >- file://cross-prop-default.patch \
> > file://0001-modules-python.py-do-not-substitute-python-s-
> >install.patch \
> > file://gi-target-dep.patch \
> >+ file://0001-Make-CPU-family-warnings-fatal.patch \
> >+ file://0002-Support-building-allarch-recipes-again.patch \
> > "
> >-SRC_URI[sha256sum] =
> >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
> >-
> >-SRC_URI_append_class-native = " \
> >- file://0001-Make-CPU-family-warnings-fatal.patch \
> >- file://0002-Support-building-allarch-recipes-again.patch \
> >-"
> >+SRC_URI[sha256sum] =
> >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
> >
> > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> > UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-
> >CPU-family-warnings-fatal.patch
> >index 300797f9ee..bcccfabd17 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fatal.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fa
> >+++ tal.patch
> >@@ -1,34 +1,33 @@
> >-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00
> >2001
> >+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00
> >2001
> > From: Ross Burton <ross.burton@intel.com>
> > Date: Tue, 3 Jul 2018 13:59:09 +0100
> >-Subject: [PATCH] Make CPU family warnings fatal
> >+Subject: [PATCH 1/2] Make CPU family warnings fatal
> >
> > Upstream-Status: Inappropriate [OE specific]
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
> >-
> > ---
> > mesonbuild/envconfig.py | 2 +-
> > mesonbuild/environment.py | 4 +---
> > 2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
> >ba35d16..2d3c34c 100644
> >+index c6a4df3..4d58c91 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> >-@@ -262,7 +262,7 @@ class MachineInfo:
> >+@@ -266,7 +266,7 @@ class MachineInfo:
> >
> > cpu_family = literal['cpu_family']
> > if cpu_family not in known_cpu_families:
> >-- mlog.warning('Unknown CPU family {}, please report this at
> >https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
> >+- mlog.warning(f'Unknown CPU family {cpu_family}, please
> report this
> >at https://github.com/mesonbuild/meson/issues/new')
> > + raise EnvironmentException('Unknown CPU family {}, see
> >https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for
> >directions.'.format(cpu_family))
> >
> > endian = literal['endian']
> > if endian not in ('little', 'big'):
> > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -
> >index 756dd81..4d2c2b6 100644
> >+index fc9b703..eea8345 100644
> > --- a/mesonbuild/environment.py
> > +++ b/mesonbuild/environment.py
> >-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
> >str:
> >+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
> >str:
> > trial = 'ppc64'
> >
> > if trial not in known_cpu_families:
> >@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
> >
> > return trial
> >
> >+--
> >+2.24.0
> >+
> >diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-
> >that-arise-when-cross-compiling.patch b/meta/recipes-
> >devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-
> >compiling.patch
> >index 471f1500da..ce90e515da 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-
> >arise-when-cross-compiling.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris
> >+++ e-when-cross-compiling.patch
> >@@ -1,4 +1,4 @@
> >-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
> >+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00
> >2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Fri, 4 Aug 2017 16:16:41 +0300
> > Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -
> >20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/mesonbuild/modules/gnome.py
> >b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644
> >+index dc2979e..c9ff9bd 100644
> > --- a/mesonbuild/modules/gnome.py
> > +++ b/mesonbuild/modules/gnome.py
> >-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
> >- args.append('--{}={}'.format(program_name, path))
> >+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
> >+ args.append(f'--{program_name}={path}')
> > if namespace:
> > args.append('--namespace=' + namespace)
> > + gtkdoc_exe_wrapper =
> >state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
> >diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-
> >not-manipulate-the-environment-when.patch b/meta/recipes-
> >devtools/meson/meson/0001-python-module-do-not-manipulate-the-
> >environment-when.patch
> >index eb0e90dbdd..fdadc6869b 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
> >manipulate-the-environment-when.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
> >manipu
> >+++ late-the-environment-when.patch
> >@@ -1,4 +1,4 @@
> >-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
> >+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00
> >2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Mon, 19 Nov 2018 14:24:26 +0100
> > Subject: [PATCH] python module: do not manipulate the environment when
> >calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
> ><alex.kanavin@gmail.com>
> > 1 file changed, 12 deletions(-)
> >
> > diff --git a/mesonbuild/modules/python.py
> >b/mesonbuild/modules/python.py -index 07be318..b770603 100644
> >+index 422155b..aaf5844 100644
> > --- a/mesonbuild/modules/python.py
> > +++ b/mesonbuild/modules/python.py
> >-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
> >+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
> > old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> > old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
> >
> >@@ -26,9 +26,9 @@ index 07be318..b770603 100644
> > -
> > try:
> > self.pkgdep = PkgConfigDependency(pkg_name,
> environment,
> >kwargs)
> >- mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
> >({})'.format(pkg_name, pkg_libdir))
> >-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
> >- mlog.debug('"{}" could not be found in LIBPC
> >({})'.format(pkg_name, pkg_libdir))
> >+ mlog.debug(f'Found "{pkg_name}" via pkgconfig
> >+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class
> >PythonDependency(ExternalDependency):
> >+ mlog.debug(f'"{pkg_name}" could not be found in
> >+LIBPC ({pkg_libdir})')
> > mlog.debug(e)
> >
> > - if old_pkg_path is not None:
> >@@ -39,5 +39,5 @@ index 07be318..b770603 100644
> > - else:
> > - os.environ.pop('PKG_CONFIG_LIBDIR', None)
> > else:
> >- mlog.debug('"{}" could not be found in LIBPC ({}), this
> is likely due to
> >a relocated python installation'.format(pkg_name, pkg_libdir))
> >+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC
> >+ ({pkg_libdir}), this is likely due to a relocated python
> >+ installation')
> >
> >diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-
> >allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
> >Support-building-allarch-recipes-again.patch
> >index f6175a194c..dcc1ce9c27 100644
> >--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
> >recipes-again.patch
> >+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
> >re
> >+++ cipes-again.patch
> >@@ -1,19 +1,18 @@
> >-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00
> >2001
> >+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00
> >2001
> > From: Peter Kjellerstedt <pkj@axis.com>
> > Date: Thu, 26 Jul 2018 16:32:49 +0200
> >-Subject: [PATCH] Support building allarch recipes again
> >+Subject: [PATCH 2/2] Support building allarch recipes again
> >
> > This registers "allarch" as a known CPU family.
> >
> > Upstream-Status: Inappropriate [OE specific]
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >-
> > ---
> > mesonbuild/envconfig.py | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
> >2d3c34c..b9e7908 100644
> >+index 4d58c91..ff01ad1 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> > @@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index
> >2d3c34c..b9e7908 100644
> > 'aarch64',
> > 'alpha',
> > 'arc',
> >+--
> >+2.24.0
> >+
> >diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >index ed85116c4f..89257b9e05 100644
> >--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >@@ -1,4 +1,4 @@
> >-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00
> >2001
> >+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
> >2001
> > From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> > Date: Wed, 15 Nov 2017 15:05:01 +0100
> > Subject: [PATCH] native_bindir
> >@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado
> ><ricardo.ribalda@gmail.com>
> >
> > ---
> > mesonbuild/dependencies/base.py | 19 +++++++++++--------
> >- mesonbuild/dependencies/ui.py | 6 +++---
> >- 2 files changed, 14 insertions(+), 11 deletions(-)
> >+ 1 file changed, 11 insertions(+), 8 deletions(-)
> >
> > diff --git a/mesonbuild/dependencies/base.py
> >b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644
> >+index 14380d4..d0c443f 100644
> > --- a/mesonbuild/dependencies/base.py
> > +++ b/mesonbuild/dependencies/base.py
> >-@@ -192,7 +192,7 @@ class Dependency:
> >+@@ -179,7 +179,7 @@ class Dependency:
> > def get_exe_args(self, compiler):
> > return []
> >
> > - def get_pkgconfig_variable(self, variable_name: str, kwargs:
> T.Dict[str,
> >T.Any]) -> str:
> > + def get_pkgconfig_variable(self, variable_name: str, kwargs:
> T.Dict[str,
> >T.Any], use_native=False) -> str:
> >- raise DependencyException('{!r} is not a pkgconfig
> >dependency'.format(self.name))
> >+ raise DependencyException(f'{self.name!r} is not a pkgconfig
> >+ dependency')
> >
> > def get_configtool_variable(self, variable_name):
> >-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
> >+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
> > return True
> > return any(d.is_built() for d in self.ext_deps)
> >
> >@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
> > raise DependencyException('Method "get_pkgconfig_variable()" is
> '
> > 'invalid for an internal dependency')
> >
> >-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
> > return s.format(self.__class__.__name__, self.name,
> self.is_found,
> > self.version_reqs)
> >
> >@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
> > p, out, err = Popen_safe(cmd, env=env)
> > rc, out, err = p.returncode, out.strip(), err.strip()
> > call = ' '.join(cmd)
> >-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
> >- env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
> >- mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
> >+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
> >+ if key.startswith('PKG_'):
> >+ mlog.debug(f'env[{key}]: {value}')
> >
> > - def _call_pkgbin(self, args, env=None):
> > + def _call_pkgbin(self, args, env=None, use_native=False):
> > # Always copy the environment since we're going to modify it
> > # with pkg-config variables
> > if env is None:
> >-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
> > targs = tuple(args)
> > cache = PkgConfigDependency.pkgbin_cache
> > if (self.pkgbin, targs, fenv) not in cache:
> >@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
> > return cache[(self.pkgbin, targs, fenv)]
> >
> > def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
> >-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
> > (self.name, out_raw))
> > self.link_args, self.raw_link_args = self._search_libs(out,
> out_raw)
> >
> >@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
> > options = ['--variable=' + variable_name, self.name]
> >
> > if 'define_variable' in kwargs:
> >-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
> >
> > options = ['--define-variable=' + '='.join(definition)] +
> options
> >
> >@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
> > variable = ''
> > if ret != 0:
> > if self.required:
> >-diff --git a/mesonbuild/dependencies/ui.py
> >b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644
> >---- a/mesonbuild/dependencies/ui.py
> >-+++ b/mesonbuild/dependencies/ui.py
> >-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
> >- self.bindir = self.get_pkgconfig_host_bins(core)
> >- if not self.bindir:
> >- # If exec_prefix is not defined, the pkg-config file is
> broken
> >-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
> >-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
> >-+ use_native=True)
> >- if prefix:
> >- self.bindir = os.path.join(prefix, 'bin')
> >-
> >-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
> >- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
> >- for application in applications:
> >- try:
> >-- return
> os.path.dirname(core.get_pkgconfig_variable('%s_location' %
> >application, {}))
> >-+ return
> >-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' %
> >-+ application, {}, use_native=True))
> >- except MesonException:
> >- pass
> >-
> >-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
> >- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
> >-
> >- def get_pkgconfig_host_bins(self, core):
> >-- return core.get_pkgconfig_variable('host_bins', {})
> >-+ return core.get_pkgconfig_variable('host_bins', {},
> >-+ use_native=True)
> >-
> >- def get_private_includes(self, mod_inc_dir, module):
> >- return _qt_get_private_includes(mod_inc_dir, module,
> self.version)
> >diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >deleted file mode 100644
> >index 772395e879..0000000000
> >--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >+++ /dev/null
> >@@ -1,23 +0,0 @@
> >-meson.build files that use cc.run() in native builds can silently
> fallback to
> >-meson.get_cross_property() in cross builds without an exe-wrapper, but
> >there's -no way to know that this is happening.
> >-
> >-As the defaults may be pessimistic (for example, disabling the support
> for a -
> >feature that should be enabled) emit a warning when the default is used,
> so
> >that -the recipe can explicitly set the cross property as relevant.
> >-
> >-Upstream-Status: Submitted
> >[https://github.com/mesonbuild/meson/pull/5071]
> >-Signed-off-by: Ross Burton <ross.burton@intel.com>
> >-
> >-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index
> >3c3cfae0..10e741ae 100644
> >---- a/mesonbuild/interpreter.py
> >-+++ b/mesonbuild/interpreter.py
> >-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
> >- return props[propname]
> >- except Exception:
> >- if len(args) == 2:
> >-+ mlog.warning('Cross property %s is using default value
> >-+ %s' % (propname, args[1]))
> >- return args[1]
> >- raise InterpreterException('Unknown cross property: %s.' %
> propname)
> >-
> >diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb b/meta/recipes-
> >devtools/meson/meson_0.58.0.bb
> >similarity index 100%
> >rename from meta/recipes-devtools/meson/meson_0.57.2.bb
> >rename to meta/recipes-devtools/meson/meson_0.58.0.bb
> >diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
> >b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
> >similarity index 100%
> >rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
> >rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
> >--
> >2.31.1
>
>
[-- Attachment #2: Type: text/html, Size: 27881 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
2021-05-12 17:03 ` Alexander Kanavin
@ 2021-05-13 5:43 ` Lee Chee Yang
2021-05-13 8:11 ` Alexander Kanavin
0 siblings, 1 reply; 13+ messages in thread
From: Lee Chee Yang @ 2021-05-13 5:43 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 21467 bytes --]
I think these error is related to this patch or the gdk-pixbuf patch in this series .
meson
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio
gdk-pixbuf
https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio
From: Alexander Kanavin <alex.kanavin@gmail.com>
Sent: Thursday, 13 May, 2021 1:04 AM
To: Lee, Chee Yang <chee.yang.lee@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
Thank you, I will look into it.
Alex
On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <chee.yang.lee@intel.com<mailto:chee.yang.lee@intel.com>> wrote:
Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test
https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio
>-----Original Message-----
>From: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> <openembedded-
>core@lists.openembedded.org<mailto:core@lists.openembedded.org>> On Behalf Of Alexander Kanavin
>Sent: Monday, 10 May, 2021 9:01 PM
>To: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org>
>Cc: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
>Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
>
>Rebase patches; dropped chunks (and cross-prop-default.patch) have been
>removed upstream.
>
>Move native-only patches to all-patches, as they're a pain to rebase
>separately.
>
>Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
>---
> meta/recipes-devtools/meson/meson.inc | 10 +---
> .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise-
>when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment-
>when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++--
> .../meson/meson/0003-native_bindir.patch | 58 +++++--------------
> .../meson/meson/cross-prop-default.patch | 23 --------
> .../{meson_0.57.2.bb<http://meson_0.57.2.bb> => meson_0.58.0.bb<http://meson_0.58.0.bb>} | 0
> ...on_0.57.2.bb<http://on_0.57.2.bb> => nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} | 0
> 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644
>meta/recipes-devtools/meson/meson/cross-prop-default.patch
> rename meta/recipes-devtools/meson/{meson_0.57.2.bb<http://meson_0.57.2.bb> =>
>meson_0.58.0.bb<http://meson_0.58.0.bb>} (100%) rename meta/recipes-devtools/meson/{nativesdk-
>meson_0.57.2.bb<http://meson_0.57.2.bb> => nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} (100%)
>
>diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
>devtools/meson/meson.inc
>index 10e7d8a1ce..12a48fc992 100644
>--- a/meta/recipes-devtools/meson/meson.inc
>+++ b/meta/recipes-devtools/meson/meson.inc
>@@ -12,16 +12,12 @@ SRC_URI =
>"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-<https://github.com/mesonbuild/meson/releases/download/$%7BPV%7D/meson->
>${P
> file://0003-native_bindir.patch \
> file://0001-python-module-do-not-manipulate-the-environment-
>when.patch \
> file://disable-rpath-handling.patch \
>- file://cross-prop-default.patch \
> file://0001-modules-python.py-do-not-substitute-python-s-
>install.patch \
> file://gi-target-dep.patch \
>+ file://0001-Make-CPU-family-warnings-fatal.patch \
>+ file://0002-Support-building-allarch-recipes-again.patch \
> "
>-SRC_URI[sha256sum] =
>"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
>-
>-SRC_URI_append_class-native = " \
>- file://0001-Make-CPU-family-warnings-fatal.patch \
>- file://0002-Support-building-allarch-recipes-again.patch \
>-"
>+SRC_URI[sha256sum] =
>"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
>
> UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
>diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-
>CPU-family-warnings-fatal.patch
>index 300797f9ee..bcccfabd17 100644
>--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fatal.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
>warnings-fa
>+++ tal.patch
>@@ -1,34 +1,33 @@
>-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00
>2001
>+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00
>2001
> From: Ross Burton <ross.burton@intel.com<mailto:ross.burton@intel.com>>
> Date: Tue, 3 Jul 2018 13:59:09 +0100
>-Subject: [PATCH] Make CPU family warnings fatal
>+Subject: [PATCH 1/2] Make CPU family warnings fatal
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Ross Burton <ross.burton@intel.com<mailto:ross.burton@intel.com>>
>-
> ---
> mesonbuild/envconfig.py | 2 +-
> mesonbuild/environment.py | 4 +---
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
>ba35d16..2d3c34c 100644
>+index c6a4df3..4d58c91 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
>-@@ -262,7 +262,7 @@ class MachineInfo:
>+@@ -266,7 +266,7 @@ class MachineInfo:
>
> cpu_family = literal['cpu_family']
> if cpu_family not in known_cpu_families:
>-- mlog.warning('Unknown CPU family {}, please report this at
>https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
>+- mlog.warning(f'Unknown CPU family {cpu_family}, please report this
>at https://github.com/mesonbuild/meson/issues/new')
> + raise EnvironmentException('Unknown CPU family {}, see
>https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for
>directions.'.format(cpu_family))
>
> endian = literal['endian']
> if endian not in ('little', 'big'):
> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -
>index 756dd81..4d2c2b6 100644
>+index fc9b703..eea8345 100644
> --- a/mesonbuild/environment.py
> +++ b/mesonbuild/environment.py
>-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
>str:
>+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
>str:
> trial = 'ppc64'
>
> if trial not in known_cpu_families:
>@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
>
> return trial
>
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-
>that-arise-when-cross-compiling.patch b/meta/recipes-
>devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-
>compiling.patch
>index 471f1500da..ce90e515da 100644
>--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-
>arise-when-cross-compiling.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris
>+++ e-when-cross-compiling.patch
>@@ -1,4 +1,4 @@
>-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
>+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
> Date: Fri, 4 Aug 2017 16:16:41 +0300
> Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -
>20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
> 1 file changed, 4 insertions(+)
>
> diff --git a/mesonbuild/modules/gnome.py
>b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644
>+index dc2979e..c9ff9bd 100644
> --- a/mesonbuild/modules/gnome.py
> +++ b/mesonbuild/modules/gnome.py
>-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
>- args.append('--{}={}'.format(program_name, path))
>+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
>+ args.append(f'--{program_name}={path}')
> if namespace:
> args.append('--namespace=' + namespace)
> + gtkdoc_exe_wrapper =
>state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
>diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-
>not-manipulate-the-environment-when.patch b/meta/recipes-
>devtools/meson/meson/0001-python-module-do-not-manipulate-the-
>environment-when.patch
>index eb0e90dbdd..fdadc6869b 100644
>--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipulate-the-environment-when.patch
>+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
>manipu
>+++ late-the-environment-when.patch
>@@ -1,4 +1,4 @@
>-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
>+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00
>2001
> From: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
> Date: Mon, 19 Nov 2018 14:24:26 +0100
> Subject: [PATCH] python module: do not manipulate the environment when
>calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
><alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>>
> 1 file changed, 12 deletions(-)
>
> diff --git a/mesonbuild/modules/python.py
>b/mesonbuild/modules/python.py -index 07be318..b770603 100644
>+index 422155b..aaf5844 100644
> --- a/mesonbuild/modules/python.py
> +++ b/mesonbuild/modules/python.py
>-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
> old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
>
>@@ -26,9 +26,9 @@ index 07be318..b770603 100644
> -
> try:
> self.pkgdep = PkgConfigDependency(pkg_name, environment,
>kwargs)
>- mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
>({})'.format(pkg_name, pkg_libdir))
>-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
>- mlog.debug('"{}" could not be found in LIBPC
>({})'.format(pkg_name, pkg_libdir))
>+ mlog.debug(f'Found "{pkg_name}" via pkgconfig
>+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class
>PythonDependency(ExternalDependency):
>+ mlog.debug(f'"{pkg_name}" could not be found in
>+LIBPC ({pkg_libdir})')
> mlog.debug(e)
>
> - if old_pkg_path is not None:
>@@ -39,5 +39,5 @@ index 07be318..b770603 100644
> - else:
> - os.environ.pop('PKG_CONFIG_LIBDIR', None)
> else:
>- mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to
>a relocated python installation'.format(pkg_name, pkg_libdir))
>+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC
>+ ({pkg_libdir}), this is likely due to a relocated python
>+ installation')
>
>diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-
>allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
>Support-building-allarch-recipes-again.patch
>index f6175a194c..dcc1ce9c27 100644
>--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
>recipes-again.patch
>+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
>re
>+++ cipes-again.patch
>@@ -1,19 +1,18 @@
>-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00
>2001
>+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00
>2001
> From: Peter Kjellerstedt <pkj@axis.com<mailto:pkj@axis.com>>
> Date: Thu, 26 Jul 2018 16:32:49 +0200
>-Subject: [PATCH] Support building allarch recipes again
>+Subject: [PATCH 2/2] Support building allarch recipes again
>
> This registers "allarch" as a known CPU family.
>
> Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>>
>-
> ---
> mesonbuild/envconfig.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
>2d3c34c..b9e7908 100644
>+index 4d58c91..ff01ad1 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
> @@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index
>2d3c34c..b9e7908 100644
> 'aarch64',
> 'alpha',
> 'arc',
>+--
>+2.24.0
>+
>diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>index ed85116c4f..89257b9e05 100644
>--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>@@ -1,4 +1,4 @@
>-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00
>2001
>+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
>2001
> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com<mailto:ricardo.ribalda@gmail.com>>
> Date: Wed, 15 Nov 2017 15:05:01 +0100
> Subject: [PATCH] native_bindir
>@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado
><ricardo.ribalda@gmail.com<mailto:ricardo.ribalda@gmail.com>>
>
> ---
> mesonbuild/dependencies/base.py | 19 +++++++++++--------
>- mesonbuild/dependencies/ui.py | 6 +++---
>- 2 files changed, 14 insertions(+), 11 deletions(-)
>+ 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/mesonbuild/dependencies/base.py
>b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644
>+index 14380d4..d0c443f 100644
> --- a/mesonbuild/dependencies/base.py
> +++ b/mesonbuild/dependencies/base.py
>-@@ -192,7 +192,7 @@ class Dependency:
>+@@ -179,7 +179,7 @@ class Dependency:
> def get_exe_args(self, compiler):
> return []
>
> - def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
>T.Any]) -> str:
> + def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str,
>T.Any], use_native=False) -> str:
>- raise DependencyException('{!r} is not a pkgconfig
>dependency'.format(self.name<http://self.name>))
>+ raise DependencyException(f'{self.name<http://self.name>!r} is not a pkgconfig
>+ dependency')
>
> def get_configtool_variable(self, variable_name):
>-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
>+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
> return True
> return any(d.is_built() for d in self.ext_deps)
>
>@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
> raise DependencyException('Method "get_pkgconfig_variable()" is '
> 'invalid for an internal dependency')
>
>-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
> return s.format(self.__class__.__name__, self.name<http://self.name>, self.is_found,
> self.version_reqs)
>
>@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
> p, out, err = Popen_safe(cmd, env=env)
> rc, out, err = p.returncode, out.strip(), err.strip()
> call = ' '.join(cmd)
>-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
>- env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
>- mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
>+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
>+ if key.startswith('PKG_'):
>+ mlog.debug(f'env[{key}]: {value}')
>
> - def _call_pkgbin(self, args, env=None):
> + def _call_pkgbin(self, args, env=None, use_native=False):
> # Always copy the environment since we're going to modify it
> # with pkg-config variables
> if env is None:
>-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
> targs = tuple(args)
> cache = PkgConfigDependency.pkgbin_cache
> if (self.pkgbin, targs, fenv) not in cache:
>@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
> return cache[(self.pkgbin, targs, fenv)]
>
> def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
>-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
> (self.name<http://self.name>, out_raw))
> self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
>
>@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
> options = ['--variable=' + variable_name, self.name<http://self.name>]
>
> if 'define_variable' in kwargs:
>-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
>+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>
> options = ['--define-variable=' + '='.join(definition)] + options
>
>@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
> variable = ''
> if ret != 0:
> if self.required:
>-diff --git a/mesonbuild/dependencies/ui.py
>b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644
>---- a/mesonbuild/dependencies/ui.py
>-+++ b/mesonbuild/dependencies/ui.py
>-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
>- self.bindir = self.get_pkgconfig_host_bins(core)
>- if not self.bindir:
>- # If exec_prefix is not defined, the pkg-config file is broken
>-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
>-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
>-+ use_native=True)
>- if prefix:
>- self.bindir = os.path.join(prefix, 'bin')
>-
>-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
>- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
>- for application in applications:
>- try:
>-- return os.path.dirname(core.get_pkgconfig_variable('%s_location' %
>application, {}))
>-+ return
>-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' %
>-+ application, {}, use_native=True))
>- except MesonException:
>- pass
>-
>-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
>- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
>-
>- def get_pkgconfig_host_bins(self, core):
>-- return core.get_pkgconfig_variable('host_bins', {})
>-+ return core.get_pkgconfig_variable('host_bins', {},
>-+ use_native=True)
>-
>- def get_private_includes(self, mod_inc_dir, module):
>- return _qt_get_private_includes(mod_inc_dir, module, self.version)
>diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>deleted file mode 100644
>index 772395e879..0000000000
>--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-meson.build files that use cc.run() in native builds can silently fallback to
>-meson.get_cross_property() in cross builds without an exe-wrapper, but
>there's -no way to know that this is happening.
>-
>-As the defaults may be pessimistic (for example, disabling the support for a -
>feature that should be enabled) emit a warning when the default is used, so
>that -the recipe can explicitly set the cross property as relevant.
>-
>-Upstream-Status: Submitted
>[https://github.com/mesonbuild/meson/pull/5071]
>-Signed-off-by: Ross Burton <ross.burton@intel.com<mailto:ross.burton@intel.com>>
>-
>-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index
>3c3cfae0..10e741ae 100644
>---- a/mesonbuild/interpreter.py
>-+++ b/mesonbuild/interpreter.py
>-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
>- return props[propname]
>- except Exception:
>- if len(args) == 2:
>-+ mlog.warning('Cross property %s is using default value
>-+ %s' % (propname, args[1]))
>- return args[1]
>- raise InterpreterException('Unknown cross property: %s.' % propname)
>-
>diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb<http://meson_0.57.2.bb> b/meta/recipes-
>devtools/meson/meson_0.58.0.bb<http://meson_0.58.0.bb>
>similarity index 100%
>rename from meta/recipes-devtools/meson/meson_0.57.2.bb<http://meson_0.57.2.bb>
>rename to meta/recipes-devtools/meson/meson_0.58.0.bb<http://meson_0.58.0.bb>
>diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb<http://nativesdk-meson_0.57.2.bb>
>b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>
>similarity index 100%
>rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb<http://nativesdk-meson_0.57.2.bb>
>rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>
>--
>2.31.1
[-- Attachment #2: Type: text/html, Size: 33256 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
2021-05-13 5:43 ` Lee Chee Yang
@ 2021-05-13 8:11 ` Alexander Kanavin
0 siblings, 0 replies; 13+ messages in thread
From: Alexander Kanavin @ 2021-05-13 8:11 UTC (permalink / raw)
To: Lee, Chee Yang; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 21476 bytes --]
I'm addressing that as well, thanks for notifying.
Alex
On Thu, 13 May 2021 at 07:44, Lee, Chee Yang <chee.yang.lee@intel.com>
wrote:
>
> I think these error is related to this patch or the gdk-pixbuf patch in
> this series .
> meson
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio
> gdk-pixbuf
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio
>
>
>
>
> *From:* Alexander Kanavin <alex.kanavin@gmail.com>
> *Sent:* Thursday, 13 May, 2021 1:04 AM
> *To:* Lee, Chee Yang <chee.yang.lee@intel.com>
> *Cc:* openembedded-core@lists.openembedded.org
> *Subject:* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
>
>
>
> Thank you, I will look into it.
>
>
>
> Alex
>
>
>
> On Wed, 12 May 2021 at 13:26, Lee, Chee Yang <chee.yang.lee@intel.com>
> wrote:
>
> Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test
>
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio
>
>
>
> >-----Original Message-----
> >From: openembedded-core@lists.openembedded.org <openembedded-
> >core@lists.openembedded.org> On Behalf Of Alexander Kanavin
> >Sent: Monday, 10 May, 2021 9:01 PM
> >To: openembedded-core@lists.openembedded.org
> >Cc: Alexander Kanavin <alex.kanavin@gmail.com>
> >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
> >
> >Rebase patches; dropped chunks (and cross-prop-default.patch) have been
> >removed upstream.
> >
> >Move native-only patches to all-patches, as they're a pain to rebase
> >separately.
> >
> >Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >---
> > meta/recipes-devtools/meson/meson.inc | 10 +---
> > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++---
> ...sues-that-arise-
> >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment-
> >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10
> ++--
> > .../meson/meson/0003-native_bindir.patch | 58 +++++--------------
> > .../meson/meson/cross-prop-default.patch | 23 --------
> > .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0
> > ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0
> > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644
> >meta/recipes-devtools/meson/meson/cross-prop-default.patch
> > rename meta/recipes-devtools/meson/{meson_0.57.2.bb =>
> >meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-
> >meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%)
> >
> >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> >devtools/meson/meson.inc
> >index 10e7d8a1ce..12a48fc992 100644
> >--- a/meta/recipes-devtools/meson/meson.inc
> >+++ b/meta/recipes-devtools/meson/meson.inc
> >@@ -12,16 +12,12 @@ SRC_URI =
> >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-
> >${P
> > file://0003-native_bindir.patch \
> > file://0001-python-module-do-not-manipulate-the-environment-
> >when.patch \
> > file://disable-rpath-handling.patch \
> >- file://cross-prop-default.patch \
> > file://0001-modules-python.py-do-not-substitute-python-s-
> >install.patch \
> > file://gi-target-dep.patch \
> >+ file://0001-Make-CPU-family-warnings-fatal.patch \
> >+ file://0002-Support-building-allarch-recipes-again.patch \
> > "
> >-SRC_URI[sha256sum] =
> >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5"
> >-
> >-SRC_URI_append_class-native = " \
> >- file://0001-Make-CPU-family-warnings-fatal.patch \
> >- file://0002-Support-building-allarch-recipes-again.patch \
> >-"
> >+SRC_URI[sha256sum] =
> >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
> >
> > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> > UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-
> >CPU-family-warnings-fatal.patch
> >index 300797f9ee..bcccfabd17 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fatal.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-
> >warnings-fa
> >+++ tal.patch
> >@@ -1,34 +1,33 @@
> >-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00
> >2001
> >+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00
> >2001
> > From: Ross Burton <ross.burton@intel.com>
> > Date: Tue, 3 Jul 2018 13:59:09 +0100
> >-Subject: [PATCH] Make CPU family warnings fatal
> >+Subject: [PATCH 1/2] Make CPU family warnings fatal
> >
> > Upstream-Status: Inappropriate [OE specific]
> > Signed-off-by: Ross Burton <ross.burton@intel.com>
> >-
> > ---
> > mesonbuild/envconfig.py | 2 +-
> > mesonbuild/environment.py | 4 +---
> > 2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
> >ba35d16..2d3c34c 100644
> >+index c6a4df3..4d58c91 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> >-@@ -262,7 +262,7 @@ class MachineInfo:
> >+@@ -266,7 +266,7 @@ class MachineInfo:
> >
> > cpu_family = literal['cpu_family']
> > if cpu_family not in known_cpu_families:
> >-- mlog.warning('Unknown CPU family {}, please report this at
> >https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
> >+- mlog.warning(f'Unknown CPU family {cpu_family}, please
> report this
> >at https://github.com/mesonbuild/meson/issues/new')
> > + raise EnvironmentException('Unknown CPU family {}, see
> >https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for
> >directions.'.format(cpu_family))
> >
> > endian = literal['endian']
> > if endian not in ('little', 'big'):
> > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -
> >index 756dd81..4d2c2b6 100644
> >+index fc9b703..eea8345 100644
> > --- a/mesonbuild/environment.py
> > +++ b/mesonbuild/environment.py
> >-@@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
> >str:
> >+@@ -436,9 +436,7 @@ def detect_cpu_family(compilers: CompilersDict) ->
> >str:
> > trial = 'ppc64'
> >
> > if trial not in known_cpu_families:
> >@@ -39,3 +38,6 @@ index 756dd81..4d2c2b6 100644
> >
> > return trial
> >
> >+--
> >+2.24.0
> >+
> >diff --git a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-
> >that-arise-when-cross-compiling.patch b/meta/recipes-
> >devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-
> >compiling.patch
> >index 471f1500da..ce90e515da 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-
> >arise-when-cross-compiling.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-aris
> >+++ e-when-cross-compiling.patch
> >@@ -1,4 +1,4 @@
> >-From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
> >+From 2f9c59e0489e569c5382404667c10f5c200a72ad Mon Sep 17 00:00:00
> >2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Fri, 4 Aug 2017 16:16:41 +0300
> > Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling @@ -
> >20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/mesonbuild/modules/gnome.py
> >b/mesonbuild/modules/gnome.py -index bcf77b9..6a4b472 100644
> >+index dc2979e..c9ff9bd 100644
> > --- a/mesonbuild/modules/gnome.py
> > +++ b/mesonbuild/modules/gnome.py
> >-@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
> >- args.append('--{}={}'.format(program_name, path))
> >+@@ -1053,6 +1053,10 @@ class GnomeModule(ExtensionModule):
> >+ args.append(f'--{program_name}={path}')
> > if namespace:
> > args.append('--namespace=' + namespace)
> > + gtkdoc_exe_wrapper =
> >state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
> >diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-
> >not-manipulate-the-environment-when.patch b/meta/recipes-
> >devtools/meson/meson/0001-python-module-do-not-manipulate-the-
> >environment-when.patch
> >index eb0e90dbdd..fdadc6869b 100644
> >--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
> >manipulate-the-environment-when.patch
> >+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-
> >manipu
> >+++ late-the-environment-when.patch
> >@@ -1,4 +1,4 @@
> >-From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
> >+From 2264e67d7c2c22ca634fd26ea8ada6f0344ab280 Mon Sep 17 00:00:00
> >2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Mon, 19 Nov 2018 14:24:26 +0100
> > Subject: [PATCH] python module: do not manipulate the environment when
> >calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin
> ><alex.kanavin@gmail.com>
> > 1 file changed, 12 deletions(-)
> >
> > diff --git a/mesonbuild/modules/python.py
> >b/mesonbuild/modules/python.py -index 07be318..b770603 100644
> >+index 422155b..aaf5844 100644
> > --- a/mesonbuild/modules/python.py
> > +++ b/mesonbuild/modules/python.py
> >-@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
> >+@@ -70,11 +70,6 @@ class PythonDependency(ExternalDependency):
> > old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> > old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
> >
> >@@ -26,9 +26,9 @@ index 07be318..b770603 100644
> > -
> > try:
> > self.pkgdep = PkgConfigDependency(pkg_name,
> environment,
> >kwargs)
> >- mlog.debug('Found "{}" via pkgconfig lookup in LIBPC
> >({})'.format(pkg_name, pkg_libdir))
> >-@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
> >- mlog.debug('"{}" could not be found in LIBPC
> >({})'.format(pkg_name, pkg_libdir))
> >+ mlog.debug(f'Found "{pkg_name}" via pkgconfig
> >+lookup in LIBPC ({pkg_libdir})') @@ -83,13 +78,6 @@ class
> >PythonDependency(ExternalDependency):
> >+ mlog.debug(f'"{pkg_name}" could not be found in
> >+LIBPC ({pkg_libdir})')
> > mlog.debug(e)
> >
> > - if old_pkg_path is not None:
> >@@ -39,5 +39,5 @@ index 07be318..b770603 100644
> > - else:
> > - os.environ.pop('PKG_CONFIG_LIBDIR', None)
> > else:
> >- mlog.debug('"{}" could not be found in LIBPC ({}), this
> is likely due to
> >a relocated python installation'.format(pkg_name, pkg_libdir))
> >+ mlog.debug(f'"{pkg_name}" could not be found in LIBPC
> >+ ({pkg_libdir}), this is likely due to a relocated python
> >+ installation')
> >
> >diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-
> >allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
> >Support-building-allarch-recipes-again.patch
> >index f6175a194c..dcc1ce9c27 100644
> >--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
> >recipes-again.patch
> >+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-
> >re
> >+++ cipes-again.patch
> >@@ -1,19 +1,18 @@
> >-From ac1021a3abf612e8be9b19eecb97062e0c314701 Mon Sep 17 00:00:00
> >2001
> >+From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00
> >2001
> > From: Peter Kjellerstedt <pkj@axis.com>
> > Date: Thu, 26 Jul 2018 16:32:49 +0200
> >-Subject: [PATCH] Support building allarch recipes again
> >+Subject: [PATCH 2/2] Support building allarch recipes again
> >
> > This registers "allarch" as a known CPU family.
> >
> > Upstream-Status: Inappropriate [OE specific]
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >-
> > ---
> > mesonbuild/envconfig.py | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index
> >2d3c34c..b9e7908 100644
> >+index 4d58c91..ff01ad1 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> > @@ -36,6 +36,7 @@ from pathlib import Path @@ -24,3 +23,6 @@ index
> >2d3c34c..b9e7908 100644
> > 'aarch64',
> > 'alpha',
> > 'arc',
> >+--
> >+2.24.0
> >+
> >diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >index ed85116c4f..89257b9e05 100644
> >--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >@@ -1,4 +1,4 @@
> >-From 1546e1f95a119175b7a4e4272a26dd85505e5ede Mon Sep 17 00:00:00
> >2001
> >+From 30e97d4090a3d3f5b7ddcaf27cfa17f3c8c1d462 Mon Sep 17 00:00:00
> >2001
> > From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> > Date: Wed, 15 Nov 2017 15:05:01 +0100
> > Subject: [PATCH] native_bindir
> >@@ -18,23 +18,22 @@ Signed-off-by: Ricardo Ribalda Delgado
> ><ricardo.ribalda@gmail.com>
> >
> > ---
> > mesonbuild/dependencies/base.py | 19 +++++++++++--------
> >- mesonbuild/dependencies/ui.py | 6 +++---
> >- 2 files changed, 14 insertions(+), 11 deletions(-)
> >+ 1 file changed, 11 insertions(+), 8 deletions(-)
> >
> > diff --git a/mesonbuild/dependencies/base.py
> >b/mesonbuild/dependencies/base.py -index cd77b4b..7e3f338 100644
> >+index 14380d4..d0c443f 100644
> > --- a/mesonbuild/dependencies/base.py
> > +++ b/mesonbuild/dependencies/base.py
> >-@@ -192,7 +192,7 @@ class Dependency:
> >+@@ -179,7 +179,7 @@ class Dependency:
> > def get_exe_args(self, compiler):
> > return []
> >
> > - def get_pkgconfig_variable(self, variable_name: str, kwargs:
> T.Dict[str,
> >T.Any]) -> str:
> > + def get_pkgconfig_variable(self, variable_name: str, kwargs:
> T.Dict[str,
> >T.Any], use_native=False) -> str:
> >- raise DependencyException('{!r} is not a pkgconfig
> >dependency'.format(self.name))
> >+ raise DependencyException(f'{self.name!r} is not a pkgconfig
> >+ dependency')
> >
> > def get_configtool_variable(self, variable_name):
> >-@@ -280,7 +280,7 @@ class InternalDependency(Dependency):
> >+@@ -267,7 +267,7 @@ class InternalDependency(Dependency):
> > return True
> > return any(d.is_built() for d in self.ext_deps)
> >
> >@@ -43,7 +42,7 @@ index cd77b4b..7e3f338 100644
> > raise DependencyException('Method "get_pkgconfig_variable()" is
> '
> > 'invalid for an internal dependency')
> >
> >-@@ -658,8 +658,11 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -645,8 +645,11 @@ class PkgConfigDependency(ExternalDependency):
> > return s.format(self.__class__.__name__, self.name,
> self.is_found,
> > self.version_reqs)
> >
> >@@ -57,16 +56,16 @@ index cd77b4b..7e3f338 100644
> > p, out, err = Popen_safe(cmd, env=env)
> > rc, out, err = p.returncode, out.strip(), err.strip()
> > call = ' '.join(cmd)
> >-@@ -685,7 +688,7 @@ class PkgConfigDependency(ExternalDependency):
> >- env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir
> >- mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir)
> >+@@ -674,7 +677,7 @@ class PkgConfigDependency(ExternalDependency):
> >+ if key.startswith('PKG_'):
> >+ mlog.debug(f'env[{key}]: {value}')
> >
> > - def _call_pkgbin(self, args, env=None):
> > + def _call_pkgbin(self, args, env=None, use_native=False):
> > # Always copy the environment since we're going to modify it
> > # with pkg-config variables
> > if env is None:
> >-@@ -699,7 +702,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -688,7 +691,7 @@ class PkgConfigDependency(ExternalDependency):
> > targs = tuple(args)
> > cache = PkgConfigDependency.pkgbin_cache
> > if (self.pkgbin, targs, fenv) not in cache:
> >@@ -75,7 +74,7 @@ index cd77b4b..7e3f338 100644
> > return cache[(self.pkgbin, targs, fenv)]
> >
> > def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
> >-@@ -905,7 +908,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -894,7 +897,7 @@ class PkgConfigDependency(ExternalDependency):
> > (self.name, out_raw))
> > self.link_args, self.raw_link_args = self._search_libs(out,
> out_raw)
> >
> >@@ -84,7 +83,7 @@ index cd77b4b..7e3f338 100644
> > options = ['--variable=' + variable_name, self.name]
> >
> > if 'define_variable' in kwargs:
> >-@@ -918,7 +921,7 @@ class PkgConfigDependency(ExternalDependency):
> >+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
> >
> > options = ['--define-variable=' + '='.join(definition)] +
> options
> >
> >@@ -93,34 +92,3 @@ index cd77b4b..7e3f338 100644
> > variable = ''
> > if ret != 0:
> > if self.required:
> >-diff --git a/mesonbuild/dependencies/ui.py
> >b/mesonbuild/dependencies/ui.py -index d897d76..a598d2e 100644
> >---- a/mesonbuild/dependencies/ui.py
> >-+++ b/mesonbuild/dependencies/ui.py
> >-@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
> >- self.bindir = self.get_pkgconfig_host_bins(core)
> >- if not self.bindir:
> >- # If exec_prefix is not defined, the pkg-config file is
> broken
> >-- prefix = core.get_pkgconfig_variable('exec_prefix', {})
> >-+ prefix = core.get_pkgconfig_variable('exec_prefix', {},
> >-+ use_native=True)
> >- if prefix:
> >- self.bindir = os.path.join(prefix, 'bin')
> >-
> >-@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
> >- applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
> >- for application in applications:
> >- try:
> >-- return
> os.path.dirname(core.get_pkgconfig_variable('%s_location' %
> >application, {}))
> >-+ return
> >-+ os.path.dirname(core.get_pkgconfig_variable('%s_location' %
> >-+ application, {}, use_native=True))
> >- except MesonException:
> >- pass
> >-
> >-@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
> >- QtBaseDependency.__init__(self, 'qt5', env, kwargs)
> >-
> >- def get_pkgconfig_host_bins(self, core):
> >-- return core.get_pkgconfig_variable('host_bins', {})
> >-+ return core.get_pkgconfig_variable('host_bins', {},
> >-+ use_native=True)
> >-
> >- def get_private_includes(self, mod_inc_dir, module):
> >- return _qt_get_private_includes(mod_inc_dir, module,
> self.version)
> >diff --git a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >b/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >deleted file mode 100644
> >index 772395e879..0000000000
> >--- a/meta/recipes-devtools/meson/meson/cross-prop-default.patch
> >+++ /dev/null
> >@@ -1,23 +0,0 @@
> >-meson.build files that use cc.run() in native builds can silently
> fallback to
> >-meson.get_cross_property() in cross builds without an exe-wrapper, but
> >there's -no way to know that this is happening.
> >-
> >-As the defaults may be pessimistic (for example, disabling the support
> for a -
> >feature that should be enabled) emit a warning when the default is used,
> so
> >that -the recipe can explicitly set the cross property as relevant.
> >-
> >-Upstream-Status: Submitted
> >[https://github.com/mesonbuild/meson/pull/5071]
> >-Signed-off-by: Ross Burton <ross.burton@intel.com>
> >-
> >-diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py -index
> >3c3cfae0..10e741ae 100644
> >---- a/mesonbuild/interpreter.py
> >-+++ b/mesonbuild/interpreter.py
> >-@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
> >- return props[propname]
> >- except Exception:
> >- if len(args) == 2:
> >-+ mlog.warning('Cross property %s is using default value
> >-+ %s' % (propname, args[1]))
> >- return args[1]
> >- raise InterpreterException('Unknown cross property: %s.' %
> propname)
> >-
> >diff --git a/meta/recipes-devtools/meson/meson_0.57.2.bb b/meta/recipes-
> >devtools/meson/meson_0.58.0.bb
> >similarity index 100%
> >rename from meta/recipes-devtools/meson/meson_0.57.2.bb
> >rename to meta/recipes-devtools/meson/meson_0.58.0.bb
> >diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
> >b/meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
> >similarity index 100%
> >rename from meta/recipes-devtools/meson/nativesdk-meson_0.57.2.bb
> >rename to meta/recipes-devtools/meson/nativesdk-meson_0.58.0.bb
> >--
> >2.31.1
>
>
[-- Attachment #2: Type: text/html, Size: 30223 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-05-13 8:12 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-10 13:01 [PATCH 1/8] Revert "go: Use dl.google.com for SRC_URI" Alexander Kanavin
2021-05-10 13:01 ` [PATCH 2/8] gdk-pixbuf: rewrite the cross-build support for tests Alexander Kanavin
2021-05-10 13:01 ` [PATCH 3/8] expat: upgrade 2.2.10 -> 2.3.0 Alexander Kanavin
2021-05-10 13:01 ` [PATCH 4/8] ffmpeg: update 4.3.2 -> 4.4 Alexander Kanavin
2021-05-10 23:22 ` [OE-core] " Khem Raj
2021-05-10 13:01 ` [PATCH 5/8] powertop: update 2.13 -> 2.14 Alexander Kanavin
2021-05-10 13:01 ` [PATCH 6/8] mesa: add lmsensors PACKAGECONFIG Alexander Kanavin
2021-05-10 13:01 ` [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 Alexander Kanavin
2021-05-12 11:26 ` [OE-core] " Lee Chee Yang
2021-05-12 17:03 ` Alexander Kanavin
2021-05-13 5:43 ` Lee Chee Yang
2021-05-13 8:11 ` Alexander Kanavin
2021-05-10 13:01 ` [PATCH 8/8] gstreamer1.0-plugins-base_1.18.4.bb: backport a patch to fix meson 0.58 builds Alexander Kanavin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.