* [PATCH 02/19] oe-selftest: extend virgl gtk test to also check the SDL option
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 03/19] runqemu: unset another environment variable for 'egl-headless' Alexander Kanavin
` (16 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/lib/oeqa/selftest/cases/runtime_test.py | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 3f212bd0eac..8f98a9ead46 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -166,9 +166,9 @@ class TestImage(OESelftestTestCase):
bitbake('core-image-full-cmdline socat')
bitbake('-c testimage core-image-full-cmdline')
- def test_testimage_virgl_gtk(self):
+ def test_testimage_virgl_gtk_sdl(self):
"""
- Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk frontend
+ Summary: Check host-assisted accelerate OpenGL functionality in qemu with gtk and SDL frontends
Expected: 1. Check that virgl kernel driver is loaded and 3d acceleration is enabled
2. Check that kmscube demo runs without crashing.
Product: oe-core
@@ -181,18 +181,27 @@ class TestImage(OESelftestTestCase):
self.skipTest('virgl isn\'t working with Debian 8')
qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native')
+ sdl_packageconfig = get_bb_var('PACKAGECONFIG', 'libsdl2-native')
features = 'INHERIT += "testimage"\n'
if 'gtk+' not in qemu_packageconfig:
features += 'PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"\n'
+ if 'sdl' not in qemu_packageconfig:
+ features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n'
if 'virglrenderer' not in qemu_packageconfig:
features += 'PACKAGECONFIG_append_pn-qemu-system-native = " virglrenderer"\n'
if 'glx' not in qemu_packageconfig:
features += 'PACKAGECONFIG_append_pn-qemu-system-native = " glx"\n'
+ if 'opengl' not in sdl_packageconfig:
+ features += 'PACKAGECONFIG_append_pn-libsdl2-native = " opengl"\n'
features += 'TEST_SUITES = "ping ssh virgl"\n'
features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n'
features += 'IMAGE_INSTALL_append = " kmscube"\n'
- features += 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
- self.write_config(features)
+ features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
+ self.write_config(features_gtk)
+ bitbake('core-image-minimal')
+ bitbake('-c testimage core-image-minimal')
+ features_sdl = features + 'TEST_RUNQEMUPARAMS = "sdl gl"\n'
+ self.write_config(features_sdl)
bitbake('core-image-minimal')
bitbake('-c testimage core-image-minimal')
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 03/19] runqemu: unset another environment variable for 'egl-headless'
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
2019-10-11 11:47 ` [PATCH 02/19] oe-selftest: extend virgl gtk test to also check the SDL option Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 04/19] gobject-introspection: update to 1.62.0 Alexander Kanavin
` (15 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Some host distributions (opensuse for example) are using 'pkgconf',
which, unlike the original pkg-config, appends PKG_CONFIG_SYSROOT_DIR
to every directory from the .pc file.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
scripts/runqemu | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/runqemu b/scripts/runqemu
index 22671f19ec3..15cc56b93ec 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -462,6 +462,7 @@ class BaseConfig(object):
del os.environ['PKG_CONFIG_PATH']
del os.environ['PKG_CONFIG_DIR']
del os.environ['PKG_CONFIG_LIBDIR']
+ del os.environ['PKG_CONFIG_SYSROOT_DIR']
except KeyError:
pass
try:
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 04/19] gobject-introspection: update to 1.62.0
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
2019-10-11 11:47 ` [PATCH 02/19] oe-selftest: extend virgl gtk test to also check the SDL option Alexander Kanavin
2019-10-11 11:47 ` [PATCH 03/19] runqemu: unset another environment variable for 'egl-headless' Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
` (14 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Upstream has removed autotools support entirely, so we can drop
the chunks of patches that touch it.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...t-cross-compilation-support-to-meson.patch | 20 +-
...pository-directory-for-native-builds.patch | 6 +-
...lete-upstream-attempt-at-cross-compi.patch | 48 -----
...-host-gi-gi-cross-wrapper-gi-ldd-wra.patch | 201 ------------------
...g-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch | 61 +-----
...0.2.bb => gobject-introspection_1.62.0.bb} | 6 +-
6 files changed, 18 insertions(+), 324 deletions(-)
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
delete mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
rename meta/recipes-gnome/gobject-introspection/{gobject-introspection_1.60.2.bb => gobject-introspection_1.62.0.bb} (96%)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
index 5747d61c192..639f9c8f61a 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Port-cross-compilation-support-to-meson.patch
@@ -1,4 +1,4 @@
-From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
+From 0417a1bb08745f2bf5310d20b342c2b3b9b212d3 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 15 Nov 2018 15:10:05 +0100
Subject: [PATCH] Port cross-compilation support to meson
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
3 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/gir/meson.build b/gir/meson.build
-index 85ae575..327c134 100644
+index c312100..a028033 100644
--- a/gir/meson.build
+++ b/gir/meson.build
-@@ -36,16 +36,29 @@ gir_files = [
+@@ -41,16 +41,29 @@ gir_files = [
typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
install_data(gir_files, install_dir: girdir)
@@ -56,7 +56,7 @@ index 85ae575..327c134 100644
dep_type = glib_dep.type_name()
if dep_type == 'internal'
-@@ -58,6 +71,12 @@ if dep_type == 'internal'
+@@ -63,6 +76,12 @@ if dep_type == 'internal'
'--extra-library=glib-2.0', '--extra-library=gobject-2.0']
endif
@@ -69,7 +69,7 @@ index 85ae575..327c134 100644
# Take a glob and print to newlines
globber = '''
from glob import glob
-@@ -84,8 +103,8 @@ glib_command = scanner_command + [
+@@ -89,8 +108,8 @@ glib_command = scanner_command + [
if dep_type == 'pkgconfig'
glib_command += ['--external-library', '--pkg=glib-2.0']
@@ -80,8 +80,8 @@ index 85ae575..327c134 100644
glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
glib_files += join_paths(glib_libincdir, 'glibconfig.h')
-@@ -339,7 +358,7 @@ endforeach
- if giounix_dep.found()
+@@ -345,7 +364,7 @@ if giounix_dep.found()
+ dep_type = giounix_dep.type_name()
if dep_type == 'pkgconfig'
gio_command += ['--pkg=gio-unix-2.0']
- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
@@ -89,7 +89,7 @@ index 85ae575..327c134 100644
# Get the installed gio-unix header list
ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
if ret.returncode() != 0
-@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
+@@ -428,15 +447,24 @@ gir_files += custom_target('gir-girepository',
)
typelibs = []
@@ -119,10 +119,10 @@ index 85ae575..327c134 100644
install_dir: typelibdir,
)
diff --git a/meson.build b/meson.build
-index 95bbd2b..f7baefd 100644
+index a5e825f..a28490a 100644
--- a/meson.build
+++ b/meson.build
-@@ -163,7 +163,9 @@ endif
+@@ -168,7 +168,9 @@ endif
subdir('girepository')
subdir('tools')
subdir('giscanner')
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index a4f45a142dd..a15401aeb2f 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From 8f01066e935a7323ff6e53f27ed1b5fb74fa11eb Mon Sep 17 00:00:00 2001
+From 673623851fb70c0e43cf79cef67b3751432ebe72 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <x-yo17@se-silbe.de>
Date: Fri, 8 Jun 2018 13:55:10 +0200
Subject: [PATCH] Relocate the repository directory for native builds
@@ -62,10 +62,10 @@ index ca5dc2b..7a4d17f 100644
typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
diff --git a/girepository/meson.build b/girepository/meson.build
-index 0261e1a..4cb646f 100644
+index 1d7aed6..5637fb5 100644
--- a/girepository/meson.build
+++ b/girepository/meson.build
-@@ -36,7 +36,7 @@ girepo_internals_lib = static_library('girepository-internals',
+@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals',
],
c_args: gi_hidden_visibility_cflags + custom_c_args,
include_directories : configinc,
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
deleted file mode 100644
index d1fdc068c08..00000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8a57aa0ac6c2f00b9b7a7fc177431f7643399e70 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 23 Mar 2016 17:07:28 +0200
-Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile
- support
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- common.mk | 4 ----
- giscanner/gdumpparser.py | 6 ------
- 2 files changed, 10 deletions(-)
-
-diff --git a/common.mk b/common.mk
-index 64fb02f..77e819d 100644
---- a/common.mk
-+++ b/common.mk
-@@ -24,12 +24,8 @@ INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=$(top_builddir) \
- --add-include-path=$(top_builddir)/gir
-
--# GI_CROSS_LAUNCHER is the command to use for executing g-ir-compiler.
--# Normally will be undefined but can be set (e.g. to wine or qemu)
--# when cross-compiling
- INTROSPECTION_COMPILER = \
- env PATH=".libs:$(PATH)" \
-- $(GI_CROSS_LAUNCHER) \
- $(top_builddir)/g-ir-compiler$(EXEEXT)
-
- INTROSPECTION_COMPILER_ARGS = \
-diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
-index 1730fee..26bab84 100644
---- a/giscanner/gdumpparser.py
-+++ b/giscanner/gdumpparser.py
-@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection."""
- out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
-
- args = []
--
-- # Prepend the launcher command and arguments, if defined
-- launcher = os.environ.get('GI_CROSS_LAUNCHER')
-- if launcher:
-- args.extend(launcher.split())
--
- args.extend(self._binary.args)
- args.append('--introspect-dump=%s,%s' % (in_path, out_path))
-
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
deleted file mode 100644
index e4fffcf6133..00000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 2335d22e4c64db3d5dfc16ac65468b9dd66db8ac Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 19 Oct 2015 18:29:21 +0300
-Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper
- and introspection-data options
-
-With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner)
-that are already installed in the host system will be used for building the source tree.
-
-With the second option, g-ir-scanner will be instructed to use an executable
-wrapper to run binaries it's producing, and g-ir-compiler will be run
-through the same wrapper (host system's g-ir-compiler cannot be used because
-it's producing architecture-specific output).
-
-With the third option, giscanner will be instructed to use a special ldd
-command instead of system's ldd (which does not work when the binary to inspect
-is compiled for a different architecture).
-
-With the fourth option, it is possible to disable building of introspection data
-(.gir and .typelib files), which may be difficult or impossible in cross-compilation
-environments, because of lack of emulation (or native hardware) for the target architecture
-on which the target binaries can be run.
-
-These options are useful when cross-compiling for a different target architecture.
-
-Upstream-Status: Pending [review on oe-core list]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- Makefile.am | 2 ++
- common.mk | 39 +++++++++++++++++++++++++++++++++++++++
- configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++
- tests/Makefile.am | 5 ++++-
- 4 files changed, 87 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 952bf71..797a3bd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -21,7 +21,9 @@ include Makefile-cmph.am
- include Makefile-girepository.am
- include Makefile-giscanner.am
- include Makefile-examples.am
-+if BUILD_INTROSPECTION_DATA
- include Makefile-gir.am
-+endif
- include Makefile-tools.am
-
- ## Process this file with automake to produce Makefile.in
-diff --git a/common.mk b/common.mk
-index 77e819d..379ab53 100644
---- a/common.mk
-+++ b/common.mk
-@@ -6,6 +6,15 @@
- # module itself.
- #
-
-+if USE_HOST_GI
-+INTROSPECTION_SCANNER = \
-+ env PATH="$(PATH)" \
-+ LPATH=.libs \
-+ CC="$(CC)" \
-+ PYTHONPATH=$(top_builddir):$(top_srcdir) \
-+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
-+ g-ir-scanner
-+else
- INTROSPECTION_SCANNER = \
- env PATH=".libs:$(PATH)" \
- LPATH=.libs \
-@@ -14,9 +23,24 @@ INTROSPECTION_SCANNER = \
- UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
- $(top_builddir)/g-ir-scanner
-+endif
-+
-+if USE_CROSS_WRAPPER
-+CROSS_WRAPPER_ARG = --use-binary-wrapper=$(GI_CROSS_WRAPPER)
-+else
-+CROSS_WRAPPER_ARG =
-+endif
-+
-+if USE_LDD_WRAPPER
-+LDD_WRAPPER_ARG = --use-ldd-wrapper=$(GI_LDD_WRAPPER)
-+else
-+LDD_WRAPPER_ARG =
-+endif
-
- INTROSPECTION_SCANNER_ARGS = \
- --verbose \
-+ $(CROSS_WRAPPER_ARG) \
-+ $(LDD_WRAPPER_ARG) \
- -I$(top_srcdir) \
- --add-include-path=$(srcdir) \
- --add-include-path=$(top_srcdir)/gir \
-@@ -24,9 +48,15 @@ INTROSPECTION_SCANNER_ARGS = \
- --add-include-path=$(top_builddir) \
- --add-include-path=$(top_builddir)/gir
-
-+if USE_CROSS_WRAPPER
-+INTROSPECTION_COMPILER = \
-+ env PATH=".libs:$(PATH)" \
-+ $(GI_CROSS_WRAPPER) $(top_builddir)/.libs/g-ir-compiler$(EXEEXT)
-+else
- INTROSPECTION_COMPILER = \
- env PATH=".libs:$(PATH)" \
- $(top_builddir)/g-ir-compiler$(EXEEXT)
-+endif
-
- INTROSPECTION_COMPILER_ARGS = \
- --includedir=$(srcdir) \
-@@ -35,6 +65,14 @@ INTROSPECTION_COMPILER_ARGS = \
- --includedir=$(top_builddir) \
- --includedir=$(top_builddir)/gir
-
-+if USE_HOST_GI
-+INTROSPECTION_DOCTOOL = \
-+ env PATH="$(PATH)" \
-+ LPATH=.libs \
-+ PYTHONPATH=$(top_builddir):$(top_srcdir) \
-+ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
-+ g-ir-doc-tool
-+else
- INTROSPECTION_DOCTOOL = \
- env PATH=".libs:$(PATH)" \
- LPATH=.libs \
-@@ -42,6 +80,7 @@ INTROSPECTION_DOCTOOL = \
- UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
- $(top_builddir)/g-ir-doc-tool
-+endif
-
- INTROSPECTION_DOCTOOL_ARGS = \
- --add-include-path=$(srcdir) \
-diff --git a/configure.ac b/configure.ac
-index 885da70..cd8108b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,6 +383,48 @@ dnl
- AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
- AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
-+AC_ARG_ENABLE([host-gi],
-+[AS_HELP_STRING([--enable-host-gi],[Use gobject introspection tools installed in the host system (useful when cross-compiling)])],
-+[case "${enableval}" in
-+ yes) host_gi=true ;;
-+ no) host_gi=false ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-host-gi]) ;;
-+esac],[host_gi=false])
-+AM_CONDITIONAL([USE_HOST_GI], [test x$host_gi = xtrue])
-+
-+AC_ARG_ENABLE([gi-cross-wrapper],
-+[AS_HELP_STRING([--enable-gi-cross-wrapper=path],[Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)])],
-+[
-+GI_CROSS_WRAPPER="${enableval}"
-+use_wrapper=true
-+],[
-+GI_CROSS_WRAPPER=""
-+use_wrapper=false
-+])
-+AC_SUBST(GI_CROSS_WRAPPER)
-+AM_CONDITIONAL([USE_CROSS_WRAPPER], [test x$use_wrapper = xtrue])
-+
-+AC_ARG_ENABLE([gi-ldd-wrapper],
-+[AS_HELP_STRING([--enable-gi-ldd-wrapper=path],[Use a ldd wrapper instead of system's ldd command in giscanner (useful when cross-compiling)])],
-+[
-+GI_LDD_WRAPPER="${enableval}"
-+use_ldd_wrapper=true
-+],[
-+GI_LDD_WRAPPER=""
-+use_ldd_wrapper=false
-+])
-+AC_SUBST(GI_LDD_WRAPPER)
-+AM_CONDITIONAL([USE_LDD_WRAPPER], [test x$use_ldd_wrapper = xtrue])
-+
-+AC_ARG_ENABLE([introspection-data],
-+[AS_HELP_STRING([--enable-introspection-data],[Build introspection data (.gir and .typelib files) in addition to library and tools])],
-+[case "${enableval}" in
-+ yes) introspection_data=true ;;
-+ no) introspection_data=false ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-introspection-data]) ;;
-+esac],[introspection_data=true])
-+AM_CONDITIONAL([BUILD_INTROSPECTION_DATA], [test x$introspection_data = xtrue])
-+
- AC_CONFIG_FILES([
- Makefile
- tests/Makefile
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4bdb9c3..10b0f27 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,6 +1,9 @@
- include $(top_srcdir)/common.mk
-
--SUBDIRS = . scanner repository offsets warn
-+SUBDIRS = . scanner repository warn
-+if BUILD_INTROSPECTION_DATA
-+SUBDIRS += offsets
-+endif
-
- EXTRA_DIST=
- BUILT_SOURCES=
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
index 74622680d6d..26f8da6d415 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
@@ -1,4 +1,4 @@
-From 74dab0fb6104ab6b715a24b783f8e8dfa5f83617 Mon Sep 17 00:00:00 2001
+From 740d91151ffe576e0c08513af9d7bc8133eb9dfb Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 8 Oct 2015 18:30:35 +0300
Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR
@@ -11,64 +11,9 @@ Upstream-Status: Pending [review on oe-core list]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
- Makefile-gir.am | 18 +++++++++---------
- m4/introspection.m4 | 8 ++++----
- 2 files changed, 13 insertions(+), 13 deletions(-)
+ m4/introspection.m4 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/Makefile-gir.am b/Makefile-gir.am
-index b59b0a6..24a50c2 100644
---- a/Makefile-gir.am
-+++ b/Makefile-gir.am
-@@ -58,8 +58,8 @@ else
- endif
-
- # glib
--GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
--GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
-+GLIB_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
-+GLIB_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
-
- GLIB_LIBRARY=glib-2.0
-
-@@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
- gir/DBusGLib-1.0.typelib: GObject-2.0.gir
-
- # gobject
--GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
--GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
-+GOBJECT_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
-+GOBJECT_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
-
- GOBJECT_LIBRARY=gobject-2.0
-
-@@ -124,8 +124,8 @@ GObject_2_0_gir_FILES = \
- BUILT_GIRSOURCES += GObject-2.0.gir
-
- # gmodule
--GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
--GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
-+GMODULE_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
-+GMODULE_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
-
- GMODULE_LIBRARY=gmodule-2.0
-
-@@ -150,13 +150,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
- BUILT_GIRSOURCES += GModule-2.0.gir
-
- # gio
--GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
--GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
-+GIO_INCLUDEDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
-+GIO_LIBDIR=$(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
-
- GIO_LIBRARY=gio-2.0
-
- if HAVE_GIO_UNIX
--GIO_UNIX_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
-+GIO_UNIX_INCLUDEDIR = $(PKG_CONFIG_SYSROOT_DIR)$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0
- GIO_UNIX_HDRS = $(wildcard $(GIO_UNIX_INCLUDEDIR)/gio/*.h)
- GIO_UNIX_PACKAGES = gio-unix-2.0
- else
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index d89c3d9..b562266 100644
--- a/m4/introspection.m4
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
similarity index 96%
rename from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb
rename to meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index f46053f4432..c925115fb73 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.60.2.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
- file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \
- file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \
file://0003-giscanner-add-use-binary-wrapper-option.patch \
file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \
file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \
@@ -21,8 +19,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
file://0001-meson.build-disable-tests-when-cross-compiling.patch \
"
-SRC_URI[md5sum] = "57c1c5dcf3d0a9aa73d06c2d5e6960d7"
-SRC_URI[sha256sum] = "ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c"
+SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1"
+SRC_URI[sha256sum] = "b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2"
SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 05/19] glib-2.0: upgrade to 2.62.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (2 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 04/19] gobject-introspection: update to 1.62.0 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-12 20:59 ` Khem Raj
` (2 more replies)
2019-10-11 11:47 ` [PATCH 06/19] glib-networking: update " Alexander Kanavin
` (13 subsequent siblings)
17 siblings, 3 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
upstream has removed the problematic bit.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
...-correctly-when-building-with-mingw3.patch | 22 +++----
...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
...ot-hardcode-linux-as-the-host-system.patch | 27 --------
.../glib-2.0/glib-2.0/relocate-modules.patch | 8 +--
.../glib-2.0/uclibc_musl_translation.patch | 22 -------
...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} | 8 +--
meta/recipes-core/glib-2.0/glib.inc | 2 +
9 files changed, 75 insertions(+), 141 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
index ede29c90bab..edac4c9f75d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
+From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -9,33 +9,44 @@ rather than use target paths).
Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
- gio/meson.build | 6 +++---
- glib/meson.build | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ gio/meson.build | 16 ++++++++--------
+ glib/meson.build | 6 +++---
+ 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gio/meson.build b/gio/meson.build
-index 85d8b14..657720a 100644
+index 71e88c4..8ce3987 100644
--- a/gio/meson.build
+++ b/gio/meson.build
-@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
+@@ -831,14 +831,14 @@ pkg.generate(libgio,
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'giomoduledir=' + giomodulesdir,
+- 'gio=' + join_paths('${bindir}', 'gio'),
+- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
-- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
+- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
+- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
+- 'gresource=' + join_paths('${bindir}', 'gresource'),
+- 'gsettings=' + join_paths('${bindir}', 'gsettings')],
++ 'gio=gio',
++ 'gio_querymodules=gio-querymodules',
+ 'glib_compile_schemas=glib-compile-schemas',
+ 'glib_compile_resources=glib-compile-resources',
-+ 'gdbus_codegen=gdbus-codegen'],
++ 'gdbus=gdbus',
++ 'gdbus_codegen=gdbus-codegen',
++ 'gresource=gresource',
++ 'gsettings=gsettings'],
version : glib_version,
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build
-index c05c694..434e8b1 100644
+index 91a48f1..978fb73 100644
--- a/glib/meson.build
+++ b/glib/meson.build
-@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
+@@ -375,9 +375,9 @@ pkg.generate(libglib,
subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
new file mode 100644
index 00000000000..d8cf269bb8e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -0,0 +1,34 @@
+From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 15 Mar 2014 22:42:29 -0700
+Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
+
+translation files are always installed under PREFIX/share/locale in uclibc
+based systems therefore lets set DATADIRNAME to "share".
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+%% original patch: uclibc_musl_translation.patch
+---
+ m4macros/glib-gettext.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
+index df6fbf0..47db864 100644
+--- a/m4macros/glib-gettext.m4
++++ b/m4macros/glib-gettext.m4
+@@ -293,6 +293,10 @@ msgstr ""
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
++ *-*-musl* | *-*-linux-uclibc*)
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
++ ;;
+ *)
+ CATOBJEXT=.mo
+ DATADIRNAME=lib
+--
+2.17.1
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
index d22a646c5de..b02169e09ba 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -1,4 +1,4 @@
-From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
+From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 028b196..217ccb1 100644
+index 95aafc1..9025eb2 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -12,7 +12,7 @@ test_c_args = [
- '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
+@@ -13,7 +13,7 @@ test_c_args = [
+ '-UG_DISABLE_ASSERT',
]
-if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
endif
-@@ -119,7 +119,7 @@ if dbus1_dep.found()
+@@ -120,7 +120,7 @@ if dbus1_dep.found()
endif
# Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
gio_tests += {
'file' : {},
'gdbus-peer' : {
-@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
+@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
endif # unix
# Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
gio_tests += {'win32-streams' : {}}
endif
-@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
+@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
}
endif
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
'gdbus-example-unix-fd-client' : {
'install' : false,
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d54fc41..a4761fe 100644
+index c47133f..cad975f 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
glib_tests += {
'gpoll' : {
diff --git a/meson.build b/meson.build
-index a745024..e87eae5 100644
+index 717d1bc..2a3beb8 100644
--- a/meson.build
+++ b/meson.build
-@@ -31,6 +31,9 @@ else
+@@ -32,6 +32,9 @@ else
endif
host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
glib_version = meson.project_version()
glib_api_version = '2.0'
diff --git a/tests/meson.build b/tests/meson.build
-index 11075dd..cd6067b 100644
+index ce30442..5710f2c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -66,7 +66,7 @@ test_extra_programs = {
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
deleted file mode 100644
index d1ed028759a..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 13 Mar 2019 16:22:09 +0000
-Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
- runtime check
-
-In cross-compilation environments the runtime check isn't possible so it is up
-to the builder to seed the cross file, but we can definitely state that strlcpy
-doesn't exist with a build test.
----
- meson.build | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15039e448..414f2d9b1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1860,22 +1860,24 @@ endif
-
- # Test if we have strlcpy/strlcat with a compatible implementation:
- # https://bugzilla.gnome.org/show_bug.cgi?id=53933
--if cc_can_run
-- rres = cc.run('''#include <stdlib.h>
-- #include <string.h>
-- int main() {
-- char p[10];
-- (void) strlcpy (p, "hi", 10);
-- if (strlcat (p, "bye", 0) != 3)
-- return 1;
-- return 0;
-- }''',
-- name : 'OpenBSD strlcpy/strlcat')
-- if rres.compiled() and rres.returncode() == 0
-+if cc.has_function('strlcpy')
-+ if cc_can_run
-+ rres = cc.run('''#include <stdlib.h>
-+ #include <string.h>
-+ int main() {
-+ char p[10];
-+ (void) strlcpy (p, "hi", 10);
-+ if (strlcat (p, "bye", 0) != 3)
-+ return 1;
-+ return 0;
-+ }''',
-+ name : 'OpenBSD strlcpy/strlcat')
-+ if rres.compiled() and rres.returncode() == 0
-+ glib_conf.set('HAVE_STRLCPY', 1)
-+ endif
-+ elif meson.get_cross_property('have_strlcpy', false)
- glib_conf.set('HAVE_STRLCPY', 1)
- endif
--elif meson.get_cross_property('have_strlcpy', false)
-- glib_conf.set('HAVE_STRLCPY', 1)
- endif
-
- python = import('python').find_installation('python3')
---
-2.11.0
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
deleted file mode 100644
index 5a1a5898908..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 19 Feb 2019 10:31:11 +0100
-Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
-
-OE build system can set this to other values that include 'linux',
-e.g. 'linux-gnueabi'
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4348f20..af5ed63 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1574,7 +1574,7 @@ atomicdefine = '''
- # We know that we can always use real ("lock free") atomic operations with MSVC
- if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
- have_atomic_lock_free = true
-- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
-+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
- # When building for armv5 on Linux, gcc provides
- # __sync_bool_compare_and_swap but doesn't define
- # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 380bee086c0..7e9925845bb 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
+From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index b92162d..fce9933 100644
+index 1007abd..5380982 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -40,6 +40,8 @@
+@@ -44,6 +44,8 @@
#include "gnetworkmonitor.h"
#ifdef G_OS_WIN32
#include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
#endif
#include <glib/gstdio.h>
-@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
+@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
#endif
g_free (install_dir);
#else
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
deleted file mode 100644
index 7aa6217d693..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix DATADIRNAME on uclibc/Linux
-
-translation files are always installed under PREFIX/share/locale in uclibc
-based systems therefore lets set DATADIRNAME to "share".
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: glib-2.46.1/m4macros/glib-gettext.m4
-===================================================================
---- glib-2.46.1.orig/m4macros/glib-gettext.m4
-+++ glib-2.46.1/m4macros/glib-gettext.m4
-@@ -243,6 +243,10 @@ msgstr ""
- CATOBJEXT=.mo
- DATADIRNAME=share
- ;;
-+ *-*-musl* | *-*-linux-uclibc*)
-+ CATOBJEXT=.gmo
-+ DATADIRNAME=share
-+ ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
similarity index 69%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d8..6d841ec9d9b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://run-ptest \
- file://uclibc_musl_translation.patch \
+ file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
file://Enable-more-tests-while-cross-compiling.patch \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
- file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
- file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
SRC_URI_append_class-target = " file://glib-meson.cross"
-SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
-SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
+SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
+SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 3ae22f5e807..8b95f212047 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
${PN}-locale-pl \
${PN}-locale-ru \
${PN}-locale-th \
+ python3-core \
+ python3-modules \
"
RDEPENDS_${PN}-ptest_append_libc-glibc = "\
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
@ 2019-10-12 20:59 ` Khem Raj
2019-10-12 22:32 ` Khem Raj
2019-10-13 0:57 ` Khem Raj
2019-10-13 1:18 ` Khem Raj
2 siblings, 1 reply; 40+ messages in thread
From: Khem Raj @ 2019-10-12 20:59 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
Regresses, on riscv
https://errors.yoctoproject.org/Errors/Details/273482/
On Fri, Oct 11, 2019 at 4:49 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
> upstream has removed the problematic bit.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
> ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
> ...-correctly-when-building-with-mingw3.patch | 22 +++----
> ...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
> ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
> .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +--
> .../glib-2.0/uclibc_musl_translation.patch | 22 -------
> ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} | 8 +--
> meta/recipes-core/glib-2.0/glib.inc | 2 +
> 9 files changed, 75 insertions(+), 141 deletions(-)
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> index ede29c90bab..edac4c9f75d 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> @@ -1,4 +1,4 @@
> -From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
> +From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 15 Feb 2019 11:17:27 +0100
> Subject: [PATCH] Do not write $bindir into pkg-config files
> @@ -9,33 +9,44 @@ rather than use target paths).
>
> Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> ---
> - gio/meson.build | 6 +++---
> - glib/meson.build | 6 +++---
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> + gio/meson.build | 16 ++++++++--------
> + glib/meson.build | 6 +++---
> + 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/gio/meson.build b/gio/meson.build
> -index 85d8b14..657720a 100644
> +index 71e88c4..8ce3987 100644
> --- a/gio/meson.build
> +++ b/gio/meson.build
> -@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
> +@@ -831,14 +831,14 @@ pkg.generate(libgio,
> 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
> 'bindir=' + join_paths('${prefix}', get_option('bindir')),
> 'giomoduledir=' + giomodulesdir,
> +- 'gio=' + join_paths('${bindir}', 'gio'),
> +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
> - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
> - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
> -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
> +- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
> +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
> +- 'gresource=' + join_paths('${bindir}', 'gresource'),
> +- 'gsettings=' + join_paths('${bindir}', 'gsettings')],
> ++ 'gio=gio',
> ++ 'gio_querymodules=gio-querymodules',
> + 'glib_compile_schemas=glib-compile-schemas',
> + 'glib_compile_resources=glib-compile-resources',
> -+ 'gdbus_codegen=gdbus-codegen'],
> ++ 'gdbus=gdbus',
> ++ 'gdbus_codegen=gdbus-codegen',
> ++ 'gresource=gresource',
> ++ 'gsettings=gsettings'],
> version : glib_version,
> install_dir : glib_pkgconfigreldir,
> filebase : 'gio-2.0',
> diff --git a/glib/meson.build b/glib/meson.build
> -index c05c694..434e8b1 100644
> +index 91a48f1..978fb73 100644
> --- a/glib/meson.build
> +++ b/glib/meson.build
> -@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
> +@@ -375,9 +375,9 @@ pkg.generate(libglib,
> subdirs : ['glib-2.0'],
> extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> new file mode 100644
> index 00000000000..d8cf269bb8e
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> @@ -0,0 +1,34 @@
> +From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sat, 15 Mar 2014 22:42:29 -0700
> +Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
> +
> +translation files are always installed under PREFIX/share/locale in uclibc
> +based systems therefore lets set DATADIRNAME to "share".
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +
> +%% original patch: uclibc_musl_translation.patch
> +---
> + m4macros/glib-gettext.m4 | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
> +index df6fbf0..47db864 100644
> +--- a/m4macros/glib-gettext.m4
> ++++ b/m4macros/glib-gettext.m4
> +@@ -293,6 +293,10 @@ msgstr ""
> + CATOBJEXT=.mo
> + DATADIRNAME=share
> + ;;
> ++ *-*-musl* | *-*-linux-uclibc*)
> ++ CATOBJEXT=.gmo
> ++ DATADIRNAME=share
> ++ ;;
> + *)
> + CATOBJEXT=.mo
> + DATADIRNAME=lib
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> index d22a646c5de..b02169e09ba 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> @@ -1,4 +1,4 @@
> -From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
> +From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 13 Feb 2019 15:32:05 +0100
> Subject: [PATCH] Set host_machine correctly when building with mingw32
> @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> -index 028b196..217ccb1 100644
> +index 95aafc1..9025eb2 100644
> --- a/gio/tests/meson.build
> +++ b/gio/tests/meson.build
> -@@ -12,7 +12,7 @@ test_c_args = [
> - '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
> +@@ -13,7 +13,7 @@ test_c_args = [
> + '-UG_DISABLE_ASSERT',
> ]
>
> -if host_machine.system() == 'windows'
> @@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
> common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
> endif
>
> -@@ -119,7 +119,7 @@ if dbus1_dep.found()
> +@@ -120,7 +120,7 @@ if dbus1_dep.found()
> endif
>
> # Test programs buildable on UNIX only
> @@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
> gio_tests += {
> 'file' : {},
> 'gdbus-peer' : {
> -@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
> +@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
> endif # unix
>
> # Test programs buildable on Windows only
> @@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
> gio_tests += {'win32-streams' : {}}
> endif
>
> -@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
> +@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
> }
> endif
>
> @@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
> 'gdbus-example-unix-fd-client' : {
> 'install' : false,
> diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> -index d54fc41..a4761fe 100644
> +index c47133f..cad975f 100644
> --- a/glib/tests/meson.build
> +++ b/glib/tests/meson.build
> @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
> @@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
> glib_tests += {
> 'gpoll' : {
> diff --git a/meson.build b/meson.build
> -index a745024..e87eae5 100644
> +index 717d1bc..2a3beb8 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -31,6 +31,9 @@ else
> +@@ -32,6 +32,9 @@ else
> endif
>
> host_system = host_machine.system()
> @@ -81,7 +81,7 @@ index a745024..e87eae5 100644
> glib_version = meson.project_version()
> glib_api_version = '2.0'
> diff --git a/tests/meson.build b/tests/meson.build
> -index 11075dd..cd6067b 100644
> +index ce30442..5710f2c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -66,7 +66,7 @@ test_extra_programs = {
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> deleted file mode 100644
> index d1ed028759a..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Wed, 13 Mar 2019 16:22:09 +0000
> -Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
> - runtime check
> -
> -In cross-compilation environments the runtime check isn't possible so it is up
> -to the builder to seed the cross file, but we can definitely state that strlcpy
> -doesn't exist with a build test.
> ----
> - meson.build | 30 ++++++++++++++++--------------
> - 1 file changed, 16 insertions(+), 14 deletions(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 15039e448..414f2d9b1 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1860,22 +1860,24 @@ endif
> -
> - # Test if we have strlcpy/strlcat with a compatible implementation:
> - # https://bugzilla.gnome.org/show_bug.cgi?id=53933
> --if cc_can_run
> -- rres = cc.run('''#include <stdlib.h>
> -- #include <string.h>
> -- int main() {
> -- char p[10];
> -- (void) strlcpy (p, "hi", 10);
> -- if (strlcat (p, "bye", 0) != 3)
> -- return 1;
> -- return 0;
> -- }''',
> -- name : 'OpenBSD strlcpy/strlcat')
> -- if rres.compiled() and rres.returncode() == 0
> -+if cc.has_function('strlcpy')
> -+ if cc_can_run
> -+ rres = cc.run('''#include <stdlib.h>
> -+ #include <string.h>
> -+ int main() {
> -+ char p[10];
> -+ (void) strlcpy (p, "hi", 10);
> -+ if (strlcat (p, "bye", 0) != 3)
> -+ return 1;
> -+ return 0;
> -+ }''',
> -+ name : 'OpenBSD strlcpy/strlcat')
> -+ if rres.compiled() and rres.returncode() == 0
> -+ glib_conf.set('HAVE_STRLCPY', 1)
> -+ endif
> -+ elif meson.get_cross_property('have_strlcpy', false)
> - glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> --elif meson.get_cross_property('have_strlcpy', false)
> -- glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> -
> - python = import('python').find_installation('python3')
> ---
> -2.11.0
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> deleted file mode 100644
> index 5a1a5898908..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Tue, 19 Feb 2019 10:31:11 +0100
> -Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
> -
> -OE build system can set this to other values that include 'linux',
> -e.g. 'linux-gnueabi'
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 4348f20..af5ed63 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1574,7 +1574,7 @@ atomicdefine = '''
> - # We know that we can always use real ("lock free") atomic operations with MSVC
> - if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
> - have_atomic_lock_free = true
> -- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
> -+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
> - # When building for armv5 on Linux, gcc provides
> - # __sync_bool_compare_and_swap but doesn't define
> - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> index 380bee086c0..7e9925845bb 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> @@ -1,4 +1,4 @@
> -From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
> +From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Fri, 11 Mar 2016 15:35:55 +0000
> Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
> @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/gio/giomodule.c b/gio/giomodule.c
> -index b92162d..fce9933 100644
> +index 1007abd..5380982 100644
> --- a/gio/giomodule.c
> +++ b/gio/giomodule.c
> -@@ -40,6 +40,8 @@
> +@@ -44,6 +44,8 @@
> #include "gnetworkmonitor.h"
> #ifdef G_OS_WIN32
> #include "gregistrysettingsbackend.h"
> @@ -31,7 +31,7 @@ index b92162d..fce9933 100644
> #endif
> #include <glib/gstdio.h>
>
> -@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
> +@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
> #endif
> g_free (install_dir);
> #else
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> deleted file mode 100644
> index 7aa6217d693..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Fix DATADIRNAME on uclibc/Linux
> -
> -translation files are always installed under PREFIX/share/locale in uclibc
> -based systems therefore lets set DATADIRNAME to "share".
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Pending
> -Index: glib-2.46.1/m4macros/glib-gettext.m4
> -===================================================================
> ---- glib-2.46.1.orig/m4macros/glib-gettext.m4
> -+++ glib-2.46.1/m4macros/glib-gettext.m4
> -@@ -243,6 +243,10 @@ msgstr ""
> - CATOBJEXT=.mo
> - DATADIRNAME=share
> - ;;
> -+ *-*-musl* | *-*-linux-uclibc*)
> -+ CATOBJEXT=.gmo
> -+ DATADIRNAME=share
> -+ ;;
> - *)
> - CATOBJEXT=.mo
> - DATADIRNAME=lib
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> similarity index 69%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> index 740473719d8..6d841ec9d9b 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> @@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
>
> SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://run-ptest \
> - file://uclibc_musl_translation.patch \
> + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
> file://Enable-more-tests-while-cross-compiling.patch \
> file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
> file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
> @@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
> file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
> file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
> - file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
> - file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
> "
>
> SRC_URI_append_class-native = " file://relocate-modules.patch"
> SRC_URI_append_class-target = " file://glib-meson.cross"
>
> -SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
> -SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
> +SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
> +SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> index 3ae22f5e807..8b95f212047 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
> ${PN}-locale-pl \
> ${PN}-locale-ru \
> ${PN}-locale-th \
> + python3-core \
> + python3-modules \
> "
>
> RDEPENDS_${PN}-ptest_append_libc-glibc = "\
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1
2019-10-12 20:59 ` Khem Raj
@ 2019-10-12 22:32 ` Khem Raj
0 siblings, 0 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-12 22:32 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
some more aarch64/musl failures
https://errors.yoctoproject.org/Errors/Details/273492/
https://errors.yoctoproject.org/Errors/Details/273494/
On Sat, Oct 12, 2019 at 1:59 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Regresses, on riscv
>
> https://errors.yoctoproject.org/Errors/Details/273482/
>
> On Fri, Oct 11, 2019 at 4:49 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> > and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where
> > upstream has removed the problematic bit.
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
> > ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
> > ...-correctly-when-building-with-mingw3.patch | 22 +++----
> > ...-time-check-for-strlcpy-before-attem.patch | 62 -------------------
> > ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
> > .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +--
> > .../glib-2.0/uclibc_musl_translation.patch | 22 -------
> > ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} | 8 +--
> > meta/recipes-core/glib-2.0/glib.inc | 2 +
> > 9 files changed, 75 insertions(+), 141 deletions(-)
> > create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> > rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} (69%)
> >
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> > index ede29c90bab..edac4c9f75d 100644
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> > @@ -1,4 +1,4 @@
> > -From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001
> > +From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Fri, 15 Feb 2019 11:17:27 +0100
> > Subject: [PATCH] Do not write $bindir into pkg-config files
> > @@ -9,33 +9,44 @@ rather than use target paths).
> >
> > Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > +
> > ---
> > - gio/meson.build | 6 +++---
> > - glib/meson.build | 6 +++---
> > - 2 files changed, 6 insertions(+), 6 deletions(-)
> > + gio/meson.build | 16 ++++++++--------
> > + glib/meson.build | 6 +++---
> > + 2 files changed, 11 insertions(+), 11 deletions(-)
> >
> > diff --git a/gio/meson.build b/gio/meson.build
> > -index 85d8b14..657720a 100644
> > +index 71e88c4..8ce3987 100644
> > --- a/gio/meson.build
> > +++ b/gio/meson.build
> > -@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
> > +@@ -831,14 +831,14 @@ pkg.generate(libgio,
> > 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
> > 'bindir=' + join_paths('${prefix}', get_option('bindir')),
> > 'giomoduledir=' + giomodulesdir,
> > +- 'gio=' + join_paths('${bindir}', 'gio'),
> > +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
> > - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
> > - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
> > -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
> > +- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
> > +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
> > +- 'gresource=' + join_paths('${bindir}', 'gresource'),
> > +- 'gsettings=' + join_paths('${bindir}', 'gsettings')],
> > ++ 'gio=gio',
> > ++ 'gio_querymodules=gio-querymodules',
> > + 'glib_compile_schemas=glib-compile-schemas',
> > + 'glib_compile_resources=glib-compile-resources',
> > -+ 'gdbus_codegen=gdbus-codegen'],
> > ++ 'gdbus=gdbus',
> > ++ 'gdbus_codegen=gdbus-codegen',
> > ++ 'gresource=gresource',
> > ++ 'gsettings=gsettings'],
> > version : glib_version,
> > install_dir : glib_pkgconfigreldir,
> > filebase : 'gio-2.0',
> > diff --git a/glib/meson.build b/glib/meson.build
> > -index c05c694..434e8b1 100644
> > +index 91a48f1..978fb73 100644
> > --- a/glib/meson.build
> > +++ b/glib/meson.build
> > -@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
> > +@@ -375,9 +375,9 @@ pkg.generate(libglib,
> > subdirs : ['glib-2.0'],
> > extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> > variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> > new file mode 100644
> > index 00000000000..d8cf269bb8e
> > --- /dev/null
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> > @@ -0,0 +1,34 @@
> > +From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Sat, 15 Mar 2014 22:42:29 -0700
> > +Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
> > +
> > +translation files are always installed under PREFIX/share/locale in uclibc
> > +based systems therefore lets set DATADIRNAME to "share".
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +Upstream-Status: Pending
> > +
> > +%% original patch: uclibc_musl_translation.patch
> > +---
> > + m4macros/glib-gettext.m4 | 4 ++++
> > + 1 file changed, 4 insertions(+)
> > +
> > +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
> > +index df6fbf0..47db864 100644
> > +--- a/m4macros/glib-gettext.m4
> > ++++ b/m4macros/glib-gettext.m4
> > +@@ -293,6 +293,10 @@ msgstr ""
> > + CATOBJEXT=.mo
> > + DATADIRNAME=share
> > + ;;
> > ++ *-*-musl* | *-*-linux-uclibc*)
> > ++ CATOBJEXT=.gmo
> > ++ DATADIRNAME=share
> > ++ ;;
> > + *)
> > + CATOBJEXT=.mo
> > + DATADIRNAME=lib
> > +--
> > +2.17.1
> > +
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> > index d22a646c5de..b02169e09ba 100644
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
> > @@ -1,4 +1,4 @@
> > -From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
> > +From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > Date: Wed, 13 Feb 2019 15:32:05 +0100
> > Subject: [PATCH] Set host_machine correctly when building with mingw32
> > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > 4 files changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> > -index 028b196..217ccb1 100644
> > +index 95aafc1..9025eb2 100644
> > --- a/gio/tests/meson.build
> > +++ b/gio/tests/meson.build
> > -@@ -12,7 +12,7 @@ test_c_args = [
> > - '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
> > +@@ -13,7 +13,7 @@ test_c_args = [
> > + '-UG_DISABLE_ASSERT',
> > ]
> >
> > -if host_machine.system() == 'windows'
> > @@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
> > common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
> > endif
> >
> > -@@ -119,7 +119,7 @@ if dbus1_dep.found()
> > +@@ -120,7 +120,7 @@ if dbus1_dep.found()
> > endif
> >
> > # Test programs buildable on UNIX only
> > @@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
> > gio_tests += {
> > 'file' : {},
> > 'gdbus-peer' : {
> > -@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
> > +@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
> > endif # unix
> >
> > # Test programs buildable on Windows only
> > @@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
> > gio_tests += {'win32-streams' : {}}
> > endif
> >
> > -@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
> > +@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
> > }
> > endif
> >
> > @@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
> > 'gdbus-example-unix-fd-client' : {
> > 'install' : false,
> > diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> > -index d54fc41..a4761fe 100644
> > +index c47133f..cad975f 100644
> > --- a/glib/tests/meson.build
> > +++ b/glib/tests/meson.build
> > @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
> > @@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
> > glib_tests += {
> > 'gpoll' : {
> > diff --git a/meson.build b/meson.build
> > -index a745024..e87eae5 100644
> > +index 717d1bc..2a3beb8 100644
> > --- a/meson.build
> > +++ b/meson.build
> > -@@ -31,6 +31,9 @@ else
> > +@@ -32,6 +32,9 @@ else
> > endif
> >
> > host_system = host_machine.system()
> > @@ -81,7 +81,7 @@ index a745024..e87eae5 100644
> > glib_version = meson.project_version()
> > glib_api_version = '2.0'
> > diff --git a/tests/meson.build b/tests/meson.build
> > -index 11075dd..cd6067b 100644
> > +index ce30442..5710f2c 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -66,7 +66,7 @@ test_extra_programs = {
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> > deleted file mode 100644
> > index d1ed028759a..00000000000
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
> > +++ /dev/null
> > @@ -1,62 +0,0 @@
> > -Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
> > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > -
> > -From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
> > -From: Ross Burton <ross.burton@intel.com>
> > -Date: Wed, 13 Mar 2019 16:22:09 +0000
> > -Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
> > - runtime check
> > -
> > -In cross-compilation environments the runtime check isn't possible so it is up
> > -to the builder to seed the cross file, but we can definitely state that strlcpy
> > -doesn't exist with a build test.
> > ----
> > - meson.build | 30 ++++++++++++++++--------------
> > - 1 file changed, 16 insertions(+), 14 deletions(-)
> > -
> > -diff --git a/meson.build b/meson.build
> > -index 15039e448..414f2d9b1 100644
> > ---- a/meson.build
> > -+++ b/meson.build
> > -@@ -1860,22 +1860,24 @@ endif
> > -
> > - # Test if we have strlcpy/strlcat with a compatible implementation:
> > - # https://bugzilla.gnome.org/show_bug.cgi?id=53933
> > --if cc_can_run
> > -- rres = cc.run('''#include <stdlib.h>
> > -- #include <string.h>
> > -- int main() {
> > -- char p[10];
> > -- (void) strlcpy (p, "hi", 10);
> > -- if (strlcat (p, "bye", 0) != 3)
> > -- return 1;
> > -- return 0;
> > -- }''',
> > -- name : 'OpenBSD strlcpy/strlcat')
> > -- if rres.compiled() and rres.returncode() == 0
> > -+if cc.has_function('strlcpy')
> > -+ if cc_can_run
> > -+ rres = cc.run('''#include <stdlib.h>
> > -+ #include <string.h>
> > -+ int main() {
> > -+ char p[10];
> > -+ (void) strlcpy (p, "hi", 10);
> > -+ if (strlcat (p, "bye", 0) != 3)
> > -+ return 1;
> > -+ return 0;
> > -+ }''',
> > -+ name : 'OpenBSD strlcpy/strlcat')
> > -+ if rres.compiled() and rres.returncode() == 0
> > -+ glib_conf.set('HAVE_STRLCPY', 1)
> > -+ endif
> > -+ elif meson.get_cross_property('have_strlcpy', false)
> > - glib_conf.set('HAVE_STRLCPY', 1)
> > - endif
> > --elif meson.get_cross_property('have_strlcpy', false)
> > -- glib_conf.set('HAVE_STRLCPY', 1)
> > - endif
> > -
> > - python = import('python').find_installation('python3')
> > ---
> > -2.11.0
> > -
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> > deleted file mode 100644
> > index 5a1a5898908..00000000000
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> > +++ /dev/null
> > @@ -1,27 +0,0 @@
> > -From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > -Date: Tue, 19 Feb 2019 10:31:11 +0100
> > -Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
> > -
> > -OE build system can set this to other values that include 'linux',
> > -e.g. 'linux-gnueabi'
> > -
> > -Upstream-Status: Pending
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ----
> > - meson.build | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/meson.build b/meson.build
> > -index 4348f20..af5ed63 100644
> > ---- a/meson.build
> > -+++ b/meson.build
> > -@@ -1574,7 +1574,7 @@ atomicdefine = '''
> > - # We know that we can always use real ("lock free") atomic operations with MSVC
> > - if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
> > - have_atomic_lock_free = true
> > -- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
> > -+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
> > - # When building for armv5 on Linux, gcc provides
> > - # __sync_bool_compare_and_swap but doesn't define
> > - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> > index 380bee086c0..7e9925845bb 100644
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> > @@ -1,4 +1,4 @@
> > -From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001
> > +From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001
> > From: Ross Burton <ross.burton@intel.com>
> > Date: Fri, 11 Mar 2016 15:35:55 +0000
> > Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
> > @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> > 1 file changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git a/gio/giomodule.c b/gio/giomodule.c
> > -index b92162d..fce9933 100644
> > +index 1007abd..5380982 100644
> > --- a/gio/giomodule.c
> > +++ b/gio/giomodule.c
> > -@@ -40,6 +40,8 @@
> > +@@ -44,6 +44,8 @@
> > #include "gnetworkmonitor.h"
> > #ifdef G_OS_WIN32
> > #include "gregistrysettingsbackend.h"
> > @@ -31,7 +31,7 @@ index b92162d..fce9933 100644
> > #endif
> > #include <glib/gstdio.h>
> >
> > -@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
> > +@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
> > #endif
> > g_free (install_dir);
> > #else
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> > deleted file mode 100644
> > index 7aa6217d693..00000000000
> > --- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
> > +++ /dev/null
> > @@ -1,22 +0,0 @@
> > -Fix DATADIRNAME on uclibc/Linux
> > -
> > -translation files are always installed under PREFIX/share/locale in uclibc
> > -based systems therefore lets set DATADIRNAME to "share".
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > -Upstream-Status: Pending
> > -Index: glib-2.46.1/m4macros/glib-gettext.m4
> > -===================================================================
> > ---- glib-2.46.1.orig/m4macros/glib-gettext.m4
> > -+++ glib-2.46.1/m4macros/glib-gettext.m4
> > -@@ -243,6 +243,10 @@ msgstr ""
> > - CATOBJEXT=.mo
> > - DATADIRNAME=share
> > - ;;
> > -+ *-*-musl* | *-*-linux-uclibc*)
> > -+ CATOBJEXT=.gmo
> > -+ DATADIRNAME=share
> > -+ ;;
> > - *)
> > - CATOBJEXT=.mo
> > - DATADIRNAME=lib
> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> > similarity index 69%
> > rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> > rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> > index 740473719d8..6d841ec9d9b 100644
> > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> > @@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
> >
> > SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> > file://run-ptest \
> > - file://uclibc_musl_translation.patch \
> > + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
> > file://Enable-more-tests-while-cross-compiling.patch \
> > file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
> > file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
> > @@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> > file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
> > file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
> > file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
> > - file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
> > - file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
> > "
> >
> > SRC_URI_append_class-native = " file://relocate-modules.patch"
> > SRC_URI_append_class-target = " file://glib-meson.cross"
> >
> > -SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
> > -SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
> > +SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
> > +SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
> > diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
> > index 3ae22f5e807..8b95f212047 100644
> > --- a/meta/recipes-core/glib-2.0/glib.inc
> > +++ b/meta/recipes-core/glib-2.0/glib.inc
> > @@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
> > ${PN}-locale-pl \
> > ${PN}-locale-ru \
> > ${PN}-locale-th \
> > + python3-core \
> > + python3-modules \
> > "
> >
> > RDEPENDS_${PN}-ptest_append_libc-glibc = "\
> > --
> > 2.17.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
2019-10-12 20:59 ` Khem Raj
@ 2019-10-13 0:57 ` Khem Raj
2019-10-13 1:18 ` Khem Raj
2 siblings, 0 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-13 0:57 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-
> attem.patch
> and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> where
> upstream has removed the problematic bit.
>
I have sent a patch to fix clang/atomics build on top of this.
https://patchwork.openembedded.org/patch/165753/
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
> ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
> ...-correctly-when-building-with-mingw3.patch | 22 +++----
> ...-time-check-for-strlcpy-before-attem.patch | 62 ---------------
> ----
> ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
> .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +--
> .../glib-2.0/uclibc_musl_translation.patch | 22 -------
> ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} | 8 +--
> meta/recipes-core/glib-2.0/glib.inc | 2 +
> 9 files changed, 75 insertions(+), 141 deletions(-)
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
> DATADIRNAME-on-uclibc-Linux.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-
> do-a-build-time-check-for-strlcpy-before-attem.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-
> meson.build-do-not-hardcode-linux-as-the-host-system.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-
> 2.0_2.62.1.bb} (69%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-
> bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> index ede29c90bab..edac4c9f75d 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-
> into-pkg-config-files.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-
> into-pkg-config-files.patch
> @@ -1,4 +1,4 @@
> -From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00
> 2001
> +From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00
> 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 15 Feb 2019 11:17:27 +0100
> Subject: [PATCH] Do not write $bindir into pkg-config files
> @@ -9,33 +9,44 @@ rather than use target paths).
>
> Upstream-Status: Inappropriate [upstream wants the paths in .pc
> files]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> ---
> - gio/meson.build | 6 +++---
> - glib/meson.build | 6 +++---
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> + gio/meson.build | 16 ++++++++--------
> + glib/meson.build | 6 +++---
> + 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/gio/meson.build b/gio/meson.build
> -index 85d8b14..657720a 100644
> +index 71e88c4..8ce3987 100644
> --- a/gio/meson.build
> +++ b/gio/meson.build
> -@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
> +@@ -831,14 +831,14 @@ pkg.generate(libgio,
> 'schemasdir=' + join_paths('${datadir}',
> schemas_subdir),
> 'bindir=' + join_paths('${prefix}',
> get_option('bindir')),
> 'giomoduledir=' + giomodulesdir,
> +- 'gio=' + join_paths('${bindir}', 'gio'),
> +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-
> querymodules'),
> - 'glib_compile_schemas=' + join_paths('${bindir}',
> 'glib-compile-schemas'),
> - 'glib_compile_resources=' + join_paths('${bindir}',
> 'glib-compile-resources'),
> -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
> codegen')],
> +- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
> +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
> codegen'),
> +- 'gresource=' + join_paths('${bindir}', 'gresource'),
> +- 'gsettings=' + join_paths('${bindir}',
> 'gsettings')],
> ++ 'gio=gio',
> ++ 'gio_querymodules=gio-querymodules',
> + 'glib_compile_schemas=glib-compile-schemas',
> + 'glib_compile_resources=glib-compile-resources',
> -+ 'gdbus_codegen=gdbus-codegen'],
> ++ 'gdbus=gdbus',
> ++ 'gdbus_codegen=gdbus-codegen',
> ++ 'gresource=gresource',
> ++ 'gsettings=gsettings'],
> version : glib_version,
> install_dir : glib_pkgconfigreldir,
> filebase : 'gio-2.0',
> diff --git a/glib/meson.build b/glib/meson.build
> -index c05c694..434e8b1 100644
> +index 91a48f1..978fb73 100644
> --- a/glib/meson.build
> +++ b/glib/meson.build
> -@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
> +@@ -375,9 +375,9 @@ pkg.generate(libglib,
> subdirs : ['glib-2.0'],
> extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> variables : ['bindir=' + join_paths('${prefix}',
> get_option('bindir')),
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
> DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> new file mode 100644
> index 00000000000..d8cf269bb8e
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-
> uclibc-Linux.patch
> @@ -0,0 +1,34 @@
> +From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00
> 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sat, 15 Mar 2014 22:42:29 -0700
> +Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
> +
> +translation files are always installed under PREFIX/share/locale in
> uclibc
> +based systems therefore lets set DATADIRNAME to "share".
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +
> +%% original patch: uclibc_musl_translation.patch
> +---
> + m4macros/glib-gettext.m4 | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
> +index df6fbf0..47db864 100644
> +--- a/m4macros/glib-gettext.m4
> ++++ b/m4macros/glib-gettext.m4
> +@@ -293,6 +293,10 @@ msgstr ""
> + CATOBJEXT=.mo
> + DATADIRNAME=share
> + ;;
> ++ *-*-musl* | *-*-linux-uclibc*)
> ++ CATOBJEXT=.gmo
> ++ DATADIRNAME=share
> ++ ;;
> + *)
> + CATOBJEXT=.mo
> + DATADIRNAME=lib
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-
> host_machine-correctly-when-building-with-mingw3.patch
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> index d22a646c5de..b02169e09ba 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> @@ -1,4 +1,4 @@
> -From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00
> 2001
> +From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00
> 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 13 Feb 2019 15:32:05 +0100
> Subject: [PATCH] Set host_machine correctly when building with
> mingw32
> @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <
> alex.kanavin@gmail.com>
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> -index 028b196..217ccb1 100644
> +index 95aafc1..9025eb2 100644
> --- a/gio/tests/meson.build
> +++ b/gio/tests/meson.build
> -@@ -12,7 +12,7 @@ test_c_args = [
> - '-
> DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path())
> ,
> +@@ -13,7 +13,7 @@ test_c_args = [
> + '-UG_DISABLE_ASSERT',
> ]
>
> -if host_machine.system() == 'windows'
> @@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
> common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
> ('secur32')]
> endif
>
> -@@ -119,7 +119,7 @@ if dbus1_dep.found()
> +@@ -120,7 +120,7 @@ if dbus1_dep.found()
> endif
>
> # Test programs buildable on UNIX only
> @@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
> gio_tests += {
> 'file' : {},
> 'gdbus-peer' : {
> -@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
> +@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
> endif # unix
>
> # Test programs buildable on Windows only
> @@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
> gio_tests += {'win32-streams' : {}}
> endif
>
> -@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
> +@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !=
> 'clang-cl'
> }
> endif
>
> @@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
> 'gdbus-example-unix-fd-client' : {
> 'install' : false,
> diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> -index d54fc41..a4761fe 100644
> +index c47133f..cad975f 100644
> --- a/glib/tests/meson.build
> +++ b/glib/tests/meson.build
> @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
> @@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
> glib_tests += {
> 'gpoll' : {
> diff --git a/meson.build b/meson.build
> -index a745024..e87eae5 100644
> +index 717d1bc..2a3beb8 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -31,6 +31,9 @@ else
> +@@ -32,6 +32,9 @@ else
> endif
>
> host_system = host_machine.system()
> @@ -81,7 +81,7 @@ index a745024..e87eae5 100644
> glib_version = meson.project_version()
> glib_api_version = '2.0'
> diff --git a/tests/meson.build b/tests/meson.build
> -index 11075dd..cd6067b 100644
> +index ce30442..5710f2c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -66,7 +66,7 @@ test_extra_programs = {
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-
> build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-
> core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-
> before-attem.patch
> deleted file mode 100644
> index d1ed028759a..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-
> check-for-strlcpy-before-attem.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00
> 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Wed, 13 Mar 2019 16:22:09 +0000
> -Subject: [PATCH] meson: do a build-time check for strlcpy before
> attempting
> - runtime check
> -
> -In cross-compilation environments the runtime check isn't possible
> so it is up
> -to the builder to seed the cross file, but we can definitely state
> that strlcpy
> -doesn't exist with a build test.
> ----
> - meson.build | 30 ++++++++++++++++--------------
> - 1 file changed, 16 insertions(+), 14 deletions(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 15039e448..414f2d9b1 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1860,22 +1860,24 @@ endif
> -
> - # Test if we have strlcpy/strlcat with a compatible implementation:
> - # https://bugzilla.gnome.org/show_bug.cgi?id=53933
> --if cc_can_run
> -- rres = cc.run('''#include <stdlib.h>
> -- #include <string.h>
> -- int main() {
> -- char p[10];
> -- (void) strlcpy (p, "hi", 10);
> -- if (strlcat (p, "bye", 0) != 3)
> -- return 1;
> -- return 0;
> -- }''',
> -- name : 'OpenBSD strlcpy/strlcat')
> -- if rres.compiled() and rres.returncode() == 0
> -+if cc.has_function('strlcpy')
> -+ if cc_can_run
> -+ rres = cc.run('''#include <stdlib.h>
> -+ #include <string.h>
> -+ int main() {
> -+ char p[10];
> -+ (void) strlcpy (p, "hi", 10);
> -+ if (strlcat (p, "bye", 0) != 3)
> -+ return 1;
> -+ return 0;
> -+ }''',
> -+ name : 'OpenBSD strlcpy/strlcat')
> -+ if rres.compiled() and rres.returncode() == 0
> -+ glib_conf.set('HAVE_STRLCPY', 1)
> -+ endif
> -+ elif meson.get_cross_property('have_strlcpy', false)
> - glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> --elif meson.get_cross_property('have_strlcpy', false)
> -- glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> -
> - python = import('python').find_installation('python3')
> ---
> -2.11.0
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-
> not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-
> 2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-
> system.patch
> deleted file mode 100644
> index 5a1a5898908..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-
> hardcode-linux-as-the-host-system.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00
> 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Tue, 19 Feb 2019 10:31:11 +0100
> -Subject: [PATCH] meson.build: do not hardcode 'linux' as the host
> system
> -
> -OE build system can set this to other values that include 'linux',
> -e.g. 'linux-gnueabi'
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 4348f20..af5ed63 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1574,7 +1574,7 @@ atomicdefine = '''
> - # We know that we can always use real ("lock free") atomic
> operations with MSVC
> - if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic
> ops')
> - have_atomic_lock_free = true
> -- if (host_system == 'android' or host_system == 'linux') and not
> cc.compiles(atomicdefine, name : 'atomic ops define')
> -+ if (host_system == 'android' or host_system.contains('linux'))
> and not cc.compiles(atomicdefine, name : 'atomic ops define')
> - # When building for armv5 on Linux, gcc provides
> - # __sync_bool_compare_and_swap but doesn't define
> - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-
> modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-
> modules.patch
> index 380bee086c0..7e9925845bb 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> @@ -1,4 +1,4 @@
> -From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00
> 2001
> +From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00
> 2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Fri, 11 Mar 2016 15:35:55 +0000
> Subject: [PATCH] glib-2.0: relocate the GIO module directory for
> native builds
> @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <
> jussi.kukkonen@intel.com>
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/gio/giomodule.c b/gio/giomodule.c
> -index b92162d..fce9933 100644
> +index 1007abd..5380982 100644
> --- a/gio/giomodule.c
> +++ b/gio/giomodule.c
> -@@ -40,6 +40,8 @@
> +@@ -44,6 +44,8 @@
> #include "gnetworkmonitor.h"
> #ifdef G_OS_WIN32
> #include "gregistrysettingsbackend.h"
> @@ -31,7 +31,7 @@ index b92162d..fce9933 100644
> #endif
> #include <glib/gstdio.h>
>
> -@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
> +@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
> #endif
> g_free (install_dir);
> #else
> diff --git a/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> deleted file mode 100644
> index 7aa6217d693..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Fix DATADIRNAME on uclibc/Linux
> -
> -translation files are always installed under PREFIX/share/locale in
> uclibc
> -based systems therefore lets set DATADIRNAME to "share".
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Pending
> -Index: glib-2.46.1/m4macros/glib-gettext.m4
> -===================================================================
> ---- glib-2.46.1.orig/m4macros/glib-gettext.m4
> -+++ glib-2.46.1/m4macros/glib-gettext.m4
> -@@ -243,6 +243,10 @@ msgstr ""
> - CATOBJEXT=.mo
> - DATADIRNAME=share
> - ;;
> -+ *-*-musl* | *-*-linux-uclibc*)
> -+ CATOBJEXT=.gmo
> -+ DATADIRNAME=share
> -+ ;;
> - *)
> - CATOBJEXT=.mo
> - DATADIRNAME=lib
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> similarity index 69%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> index 740473719d8..6d841ec9d9b 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> @@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
>
> SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://run-ptest \
> - file://uclibc_musl_translation.patch \
> + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
> file://Enable-more-tests-while-cross-compiling.patch \
> file://0001-Remove-the-warning-about-deprecated-paths-in-
> schemas.patch \
> file://0001-Install-gio-querymodules-as-
> libexec_PROGRAM.patch \
> @@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-
> ${PV}.tar.xz \
> file://0010-Do-not-hardcode-python-path-into-various-
> tools.patch \
> file://0001-Set-host_machine-correctly-when-building-
> with-mingw3.patch \
> file://0001-Do-not-write-bindir-into-pkg-config-
> files.patch \
> - file://0001-meson.build-do-not-hardcode-linux-as-the-
> host-system.patch \
> - file://0001-meson-do-a-build-time-check-for-strlcpy-
> before-attem.patch \
> "
>
> SRC_URI_append_class-native = " file://relocate-modules.patch"
> SRC_URI_append_class-target = " file://glib-meson.cross"
>
> -SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
> -SRC_URI[sha256sum] =
> "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
> +SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
> +SRC_URI[sha256sum] =
> "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-
> core/glib-2.0/glib.inc
> index 3ae22f5e807..8b95f212047 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
> ${PN}-locale-pl \
> ${PN}-locale-ru \
> ${PN}-locale-th \
> + python3-core \
> + python3-modules \
> "
>
> RDEPENDS_${PN}-ptest_append_libc-glibc = "\
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 05/19] glib-2.0: upgrade to 2.62.1
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
2019-10-12 20:59 ` Khem Raj
2019-10-13 0:57 ` Khem Raj
@ 2019-10-13 1:18 ` Khem Raj
2 siblings, 0 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-13 1:18 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
libmbim/qemuarm fails too with following error
| ../../../libmbim-1.18.0/src/libmbim-glib/mbim-proxy.c: In function
'mbim_proxy_init':
| ../../../libmbim-1.18.0/src/libmbim-glib/mbim-proxy.c:1446:13: error:
G_ADD_PRIVATE [-Werror]
| 1446
| MbimProxyPrivate);
| | ^
| cc1: all warnings being treated as errors
| Makefile:670: recipe for target 'libmbim_glib_core_la-mbim-proxy.lo'
failed
| make[4]: *** [libmbim_glib_core_la-mbim-proxy.lo] Error 1
| make[4]: Leaving directory
'/home/jenkins/oe/world/yoe/build/tmpfs/work/armv7vet2hf-neon-yoe-
linux-gnueabi/libmbim/1.18.0-r0/build/src/libmbim-glib'
On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-
> attem.patch
> and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
> where
> upstream has removed the problematic bit.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...t-write-bindir-into-pkg-config-files.patch | 31 +++++++---
> ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 34 ++++++++++
> ...-correctly-when-building-with-mingw3.patch | 22 +++----
> ...-time-check-for-strlcpy-before-attem.patch | 62 ---------------
> ----
> ...ot-hardcode-linux-as-the-host-system.patch | 27 --------
> .../glib-2.0/glib-2.0/relocate-modules.patch | 8 +--
> .../glib-2.0/uclibc_musl_translation.patch | 22 -------
> ...{glib-2.0_2.60.7.bb => glib-2.0_2.62.1.bb} | 8 +--
> meta/recipes-core/glib-2.0/glib.inc | 2 +
> 9 files changed, 75 insertions(+), 141 deletions(-)
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
> DATADIRNAME-on-uclibc-Linux.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-meson-
> do-a-build-time-check-for-strlcpy-before-attem.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0001-
> meson.build-do-not-hardcode-linux-as-the-host-system.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.7.bb => glib-
> 2.0_2.62.1.bb} (69%)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-
> bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
> index ede29c90bab..edac4c9f75d 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-
> into-pkg-config-files.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-
> into-pkg-config-files.patch
> @@ -1,4 +1,4 @@
> -From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00
> 2001
> +From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00
> 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Fri, 15 Feb 2019 11:17:27 +0100
> Subject: [PATCH] Do not write $bindir into pkg-config files
> @@ -9,33 +9,44 @@ rather than use target paths).
>
> Upstream-Status: Inappropriate [upstream wants the paths in .pc
> files]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> ---
> - gio/meson.build | 6 +++---
> - glib/meson.build | 6 +++---
> - 2 files changed, 6 insertions(+), 6 deletions(-)
> + gio/meson.build | 16 ++++++++--------
> + glib/meson.build | 6 +++---
> + 2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/gio/meson.build b/gio/meson.build
> -index 85d8b14..657720a 100644
> +index 71e88c4..8ce3987 100644
> --- a/gio/meson.build
> +++ b/gio/meson.build
> -@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio,
> +@@ -831,14 +831,14 @@ pkg.generate(libgio,
> 'schemasdir=' + join_paths('${datadir}',
> schemas_subdir),
> 'bindir=' + join_paths('${prefix}',
> get_option('bindir')),
> 'giomoduledir=' + giomodulesdir,
> +- 'gio=' + join_paths('${bindir}', 'gio'),
> +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-
> querymodules'),
> - 'glib_compile_schemas=' + join_paths('${bindir}',
> 'glib-compile-schemas'),
> - 'glib_compile_resources=' + join_paths('${bindir}',
> 'glib-compile-resources'),
> -- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
> codegen')],
> +- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
> +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-
> codegen'),
> +- 'gresource=' + join_paths('${bindir}', 'gresource'),
> +- 'gsettings=' + join_paths('${bindir}',
> 'gsettings')],
> ++ 'gio=gio',
> ++ 'gio_querymodules=gio-querymodules',
> + 'glib_compile_schemas=glib-compile-schemas',
> + 'glib_compile_resources=glib-compile-resources',
> -+ 'gdbus_codegen=gdbus-codegen'],
> ++ 'gdbus=gdbus',
> ++ 'gdbus_codegen=gdbus-codegen',
> ++ 'gresource=gresource',
> ++ 'gsettings=gsettings'],
> version : glib_version,
> install_dir : glib_pkgconfigreldir,
> filebase : 'gio-2.0',
> diff --git a/glib/meson.build b/glib/meson.build
> -index c05c694..434e8b1 100644
> +index 91a48f1..978fb73 100644
> --- a/glib/meson.build
> +++ b/glib/meson.build
> -@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl],
> +@@ -375,9 +375,9 @@ pkg.generate(libglib,
> subdirs : ['glib-2.0'],
> extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
> variables : ['bindir=' + join_paths('${prefix}',
> get_option('bindir')),
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-
> DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
> new file mode 100644
> index 00000000000..d8cf269bb8e
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-
> uclibc-Linux.patch
> @@ -0,0 +1,34 @@
> +From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00
> 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sat, 15 Mar 2014 22:42:29 -0700
> +Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
> +
> +translation files are always installed under PREFIX/share/locale in
> uclibc
> +based systems therefore lets set DATADIRNAME to "share".
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +Upstream-Status: Pending
> +
> +%% original patch: uclibc_musl_translation.patch
> +---
> + m4macros/glib-gettext.m4 | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
> +index df6fbf0..47db864 100644
> +--- a/m4macros/glib-gettext.m4
> ++++ b/m4macros/glib-gettext.m4
> +@@ -293,6 +293,10 @@ msgstr ""
> + CATOBJEXT=.mo
> + DATADIRNAME=share
> + ;;
> ++ *-*-musl* | *-*-linux-uclibc*)
> ++ CATOBJEXT=.gmo
> ++ DATADIRNAME=share
> ++ ;;
> + *)
> + CATOBJEXT=.mo
> + DATADIRNAME=lib
> +--
> +2.17.1
> +
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-
> host_machine-correctly-when-building-with-mingw3.patch
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> index d22a646c5de..b02169e09ba 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-
> correctly-when-building-with-mingw3.patch
> @@ -1,4 +1,4 @@
> -From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00
> 2001
> +From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00
> 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 13 Feb 2019 15:32:05 +0100
> Subject: [PATCH] Set host_machine correctly when building with
> mingw32
> @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <
> alex.kanavin@gmail.com>
> 4 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/gio/tests/meson.build b/gio/tests/meson.build
> -index 028b196..217ccb1 100644
> +index 95aafc1..9025eb2 100644
> --- a/gio/tests/meson.build
> +++ b/gio/tests/meson.build
> -@@ -12,7 +12,7 @@ test_c_args = [
> - '-
> DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path())
> ,
> +@@ -13,7 +13,7 @@ test_c_args = [
> + '-UG_DISABLE_ASSERT',
> ]
>
> -if host_machine.system() == 'windows'
> @@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
> common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library
> ('secur32')]
> endif
>
> -@@ -119,7 +119,7 @@ if dbus1_dep.found()
> +@@ -120,7 +120,7 @@ if dbus1_dep.found()
> endif
>
> # Test programs buildable on UNIX only
> @@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
> gio_tests += {
> 'file' : {},
> 'gdbus-peer' : {
> -@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
> +@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
> endif # unix
>
> # Test programs buildable on Windows only
> @@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
> gio_tests += {'win32-streams' : {}}
> endif
>
> -@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
> +@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() !=
> 'clang-cl'
> }
> endif
>
> @@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
> 'gdbus-example-unix-fd-client' : {
> 'install' : false,
> diff --git a/glib/tests/meson.build b/glib/tests/meson.build
> -index d54fc41..a4761fe 100644
> +index c47133f..cad975f 100644
> --- a/glib/tests/meson.build
> +++ b/glib/tests/meson.build
> @@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
> @@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
> glib_tests += {
> 'gpoll' : {
> diff --git a/meson.build b/meson.build
> -index a745024..e87eae5 100644
> +index 717d1bc..2a3beb8 100644
> --- a/meson.build
> +++ b/meson.build
> -@@ -31,6 +31,9 @@ else
> +@@ -32,6 +32,9 @@ else
> endif
>
> host_system = host_machine.system()
> @@ -81,7 +81,7 @@ index a745024..e87eae5 100644
> glib_version = meson.project_version()
> glib_api_version = '2.0'
> diff --git a/tests/meson.build b/tests/meson.build
> -index 11075dd..cd6067b 100644
> +index ce30442..5710f2c 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -66,7 +66,7 @@ test_extra_programs = {
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-
> build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-
> core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-
> before-attem.patch
> deleted file mode 100644
> index d1ed028759a..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-
> check-for-strlcpy-before-attem.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00
> 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Wed, 13 Mar 2019 16:22:09 +0000
> -Subject: [PATCH] meson: do a build-time check for strlcpy before
> attempting
> - runtime check
> -
> -In cross-compilation environments the runtime check isn't possible
> so it is up
> -to the builder to seed the cross file, but we can definitely state
> that strlcpy
> -doesn't exist with a build test.
> ----
> - meson.build | 30 ++++++++++++++++--------------
> - 1 file changed, 16 insertions(+), 14 deletions(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 15039e448..414f2d9b1 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1860,22 +1860,24 @@ endif
> -
> - # Test if we have strlcpy/strlcat with a compatible implementation:
> - # https://bugzilla.gnome.org/show_bug.cgi?id=53933
> --if cc_can_run
> -- rres = cc.run('''#include <stdlib.h>
> -- #include <string.h>
> -- int main() {
> -- char p[10];
> -- (void) strlcpy (p, "hi", 10);
> -- if (strlcat (p, "bye", 0) != 3)
> -- return 1;
> -- return 0;
> -- }''',
> -- name : 'OpenBSD strlcpy/strlcat')
> -- if rres.compiled() and rres.returncode() == 0
> -+if cc.has_function('strlcpy')
> -+ if cc_can_run
> -+ rres = cc.run('''#include <stdlib.h>
> -+ #include <string.h>
> -+ int main() {
> -+ char p[10];
> -+ (void) strlcpy (p, "hi", 10);
> -+ if (strlcat (p, "bye", 0) != 3)
> -+ return 1;
> -+ return 0;
> -+ }''',
> -+ name : 'OpenBSD strlcpy/strlcat')
> -+ if rres.compiled() and rres.returncode() == 0
> -+ glib_conf.set('HAVE_STRLCPY', 1)
> -+ endif
> -+ elif meson.get_cross_property('have_strlcpy', false)
> - glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> --elif meson.get_cross_property('have_strlcpy', false)
> -- glib_conf.set('HAVE_STRLCPY', 1)
> - endif
> -
> - python = import('python').find_installation('python3')
> ---
> -2.11.0
> -
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-
> not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-
> 2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-
> system.patch
> deleted file mode 100644
> index 5a1a5898908..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-
> hardcode-linux-as-the-host-system.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00
> 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Tue, 19 Feb 2019 10:31:11 +0100
> -Subject: [PATCH] meson.build: do not hardcode 'linux' as the host
> system
> -
> -OE build system can set this to other values that include 'linux',
> -e.g. 'linux-gnueabi'
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 4348f20..af5ed63 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -1574,7 +1574,7 @@ atomicdefine = '''
> - # We know that we can always use real ("lock free") atomic
> operations with MSVC
> - if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic
> ops')
> - have_atomic_lock_free = true
> -- if (host_system == 'android' or host_system == 'linux') and not
> cc.compiles(atomicdefine, name : 'atomic ops define')
> -+ if (host_system == 'android' or host_system.contains('linux'))
> and not cc.compiles(atomicdefine, name : 'atomic ops define')
> - # When building for armv5 on Linux, gcc provides
> - # __sync_bool_compare_and_swap but doesn't define
> - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-
> modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-
> modules.patch
> index 380bee086c0..7e9925845bb 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
> @@ -1,4 +1,4 @@
> -From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00
> 2001
> +From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00
> 2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Fri, 11 Mar 2016 15:35:55 +0000
> Subject: [PATCH] glib-2.0: relocate the GIO module directory for
> native builds
> @@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <
> jussi.kukkonen@intel.com>
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/gio/giomodule.c b/gio/giomodule.c
> -index b92162d..fce9933 100644
> +index 1007abd..5380982 100644
> --- a/gio/giomodule.c
> +++ b/gio/giomodule.c
> -@@ -40,6 +40,8 @@
> +@@ -44,6 +44,8 @@
> #include "gnetworkmonitor.h"
> #ifdef G_OS_WIN32
> #include "gregistrysettingsbackend.h"
> @@ -31,7 +31,7 @@ index b92162d..fce9933 100644
> #endif
> #include <glib/gstdio.h>
>
> -@@ -1156,7 +1158,15 @@ get_gio_module_dir (void)
> +@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
> #endif
> g_free (install_dir);
> #else
> diff --git a/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> deleted file mode 100644
> index 7aa6217d693..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-
> 2.0/uclibc_musl_translation.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Fix DATADIRNAME on uclibc/Linux
> -
> -translation files are always installed under PREFIX/share/locale in
> uclibc
> -based systems therefore lets set DATADIRNAME to "share".
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Upstream-Status: Pending
> -Index: glib-2.46.1/m4macros/glib-gettext.m4
> -===================================================================
> ---- glib-2.46.1.orig/m4macros/glib-gettext.m4
> -+++ glib-2.46.1/m4macros/glib-gettext.m4
> -@@ -243,6 +243,10 @@ msgstr ""
> - CATOBJEXT=.mo
> - DATADIRNAME=share
> - ;;
> -+ *-*-musl* | *-*-linux-uclibc*)
> -+ CATOBJEXT=.gmo
> -+ DATADIRNAME=share
> -+ ;;
> - *)
> - CATOBJEXT=.mo
> - DATADIRNAME=lib
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> similarity index 69%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> index 740473719d8..6d841ec9d9b 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
> @@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
>
> SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://run-ptest \
> - file://uclibc_musl_translation.patch \
> + file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
> file://Enable-more-tests-while-cross-compiling.patch \
> file://0001-Remove-the-warning-about-deprecated-paths-in-
> schemas.patch \
> file://0001-Install-gio-querymodules-as-
> libexec_PROGRAM.patch \
> @@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-
> ${PV}.tar.xz \
> file://0010-Do-not-hardcode-python-path-into-various-
> tools.patch \
> file://0001-Set-host_machine-correctly-when-building-
> with-mingw3.patch \
> file://0001-Do-not-write-bindir-into-pkg-config-
> files.patch \
> - file://0001-meson.build-do-not-hardcode-linux-as-the-
> host-system.patch \
> - file://0001-meson-do-a-build-time-check-for-strlcpy-
> before-attem.patch \
> "
>
> SRC_URI_append_class-native = " file://relocate-modules.patch"
> SRC_URI_append_class-target = " file://glib-meson.cross"
>
> -SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
> -SRC_URI[sha256sum] =
> "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
> +SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
> +SRC_URI[sha256sum] =
> "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
> diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-
> core/glib-2.0/glib.inc
> index 3ae22f5e807..8b95f212047 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
> ${PN}-locale-pl \
> ${PN}-locale-ru \
> ${PN}-locale-th \
> + python3-core \
> + python3-modules \
> "
>
> RDEPENDS_${PN}-ptest_append_libc-glibc = "\
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 06/19] glib-networking: update to 2.62.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (3 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 07/19] sysprof: update to 3.34.1 Alexander Kanavin
` (12 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{glib-networking_2.60.3.bb => glib-networking_2.62.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.60.3.bb => glib-networking_2.62.1.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb b/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
index 0278ab2fb68..81d3fd43d9e 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.62.1.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "e8fd0462a82269fb4bbd6c07a1e7d0f4"
-SRC_URI[archive.sha256sum] = "d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5"
+SRC_URI[archive.md5sum] = "64ca1e1e43e623b916059585bf7e4758"
+SRC_URI[archive.sha256sum] = "3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110"
PACKAGECONFIG ??= "gnutls"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 07/19] sysprof: update to 3.34.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (4 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 06/19] glib-networking: update " Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 08/19] epiphany: upgrade 3.32.4 -> 3.34.1 Alexander Kanavin
` (11 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
is replaced by a meson option.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...thing-in-help-as-it-requires-itstool.patch | 27 --------------
...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 +++++++++++++++++++
.../files/define-NT_GNU_BUILD_ID.patch | 22 ------------
.../{sysprof_3.32.0.bb => sysprof_3.34.1.bb} | 16 +++++----
4 files changed, 45 insertions(+), 55 deletions(-)
delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
create mode 100644 meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
rename meta/recipes-kernel/sysprof/{sysprof_3.32.0.bb => sysprof_3.34.1.bb} (63%)
diff --git a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
deleted file mode 100644
index ade51cf864f..00000000000
--- a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 23 Aug 2017 18:38:26 +0300
-Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3986273..ae2f65e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -164,7 +164,6 @@ subdir('tools')
- subdir('tests')
-
- subdir('data')
--subdir('help')
- subdir('po')
-
- meson.add_install_script('build-aux/meson/post_install.sh')
---
-2.7.4
-
diff --git a/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
new file mode 100644
index 00000000000..75aa86cdbf0
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
@@ -0,0 +1,35 @@
+From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 18 Jul 2011 16:00:17 -0700
+Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined
+
+On uclibc elf.h does not have GNU extentions but we need this define
+so we define it locally if its not getting it from elf.h
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+%% original patch: define-NT_GNU_BUILD_ID.patch
+---
+ src/libsysprof/elfparser.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h
+index 160e4c9..94fa5c0 100644
+--- a/src/libsysprof/elfparser.h
++++ b/src/libsysprof/elfparser.h
+@@ -18,6 +18,10 @@
+
+ #include <glib.h>
+
++#ifndef NT_GNU_BUILD_ID
++#define NT_GNU_BUILD_ID 3
++#endif
++
+ typedef struct ElfSym ElfSym;
+ typedef struct ElfParser ElfParser;
+
+--
+2.17.1
+
diff --git a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
deleted file mode 100644
index f75ddad43a1..00000000000
--- a/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-On uclibc elf.h does not have GNU extentions but we need this define
-so we define it locally if its not getting it from elf.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/elfparser.h
-===================================================================
---- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700
-+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700
-@@ -17,6 +17,10 @@
- */
- #include <glib.h>
-
-+#ifndef NT_GNU_BUILD_ID
-+#define NT_GNU_BUILD_ID 3
-+#endif
-+
- typedef struct ElfSym ElfSym;
- typedef struct ElfParser ElfParser;
-
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
similarity index 63%
rename from meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
index b92933806cf..6d04cce5303 100644
--- a/meta/recipes-kernel/sysprof/sysprof_3.32.0.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_3.34.1.bb
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux"
HOMEPAGE = "http://www.sysprof.com"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
- file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
+ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext systemd upstream-version-is-even gsettings
DEPENDS = "glib-2.0 libxml2-native glib-2.0-native"
-SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af"
-SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"
+SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629"
+SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0"
SRC_URI += " \
- file://define-NT_GNU_BUILD_ID.patch \
- file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
+ file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \
"
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
-PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3"
+PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
+PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"
+
+# Enablig this requries yelp
+EXTRA_OEMESON += "-Dhelp=false"
SOLIBS = ".so"
FILES_SOLIBSDEV = ""
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp
FILES_${PN} += " \
${datadir}/dbus-1/system-services \
${datadir}/dbus-1/system.d \
+ ${datadir}/dbus-1/interfaces \
${datadir}/metainfo \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 08/19] epiphany: upgrade 3.32.4 -> 3.34.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (5 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 07/19] sysprof: update to 3.34.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1 Alexander Kanavin
` (10 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/epiphany/{epiphany_3.32.4.bb => epiphany_3.34.1.bb} (84%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
similarity index 84%
rename from meta/recipes-gnome/epiphany/epiphany_3.32.4.bb
rename to meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
index 44af469942b..f5f086391e5 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.32.4.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.34.1.bb
@@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
"
-SRC_URI[archive.md5sum] = "6a5eada8a3870ab4d0fcd5168559776f"
-SRC_URI[archive.sha256sum] = "c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995"
+SRC_URI[archive.md5sum] = "50b50e18d99b19f44cc9cd419c6a4ba8"
+SRC_URI[archive.sha256sum] = "a07bc997ad2cbf14d58557bb0b63e92d8c33683680c5e50ea6f9b53b36bec1d9"
FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (6 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 08/19] epiphany: upgrade 3.32.4 -> 3.34.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 14:39 ` Khem Raj
2019-10-11 11:47 ` [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32 Alexander Kanavin
` (9 subsequent siblings)
17 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Drop patches:
- 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch - this
has been a pain to rebase for a while as upstream keeps shifting and
changing the code that needs to be modified. If the issue the patch
is addressing is still relevant, please work with upstream to fix it
at the source
- 0001-gstreamer-add-a-missing-format-string.patch, narrowing.patch
are integrated upstream
- detect-gstreamer-gl.patch is adjusting something that is better done
from the yocto package configuration
Add an option to disable an enabled-by-default sandbox that requires
a component that oe-core does not have.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...acros-Append-to-I-and-not-to-isystem.patch | 125 ------------------
...streamer-add-a-missing-format-string.patch | 24 ----
.../webkitgtk/detect-gstreamer-gl.patch | 20 ---
.../webkit/webkitgtk/narrowing.patch | 31 -----
...ebkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} | 9 +-
5 files changed, 3 insertions(+), 206 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
delete mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch
rename meta/recipes-sato/webkit/{webkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} (93%)
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
deleted file mode 100644
index e71905d26a1..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 17 Apr 2016 12:35:41 -0700
-Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
-
-gcc-6 has now introduced stdlib.h in libstdc++ for better
-compliance and its including the C library stdlib.h using
-include_next which is sensitive to order of system header
-include paths. Its infact better to not tinker with the
-system header include paths at all. Since adding /usr/include
-to -system is redundant and compiler knows about it moreover
-now with gcc6 it interferes with compiler's functioning
-and ends up with compile errors e.g.
-
-/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
----
- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
- Source/WebCore/PlatformGTK.cmake | 6 +++---
- Source/WebKit/PlatformGTK.cmake | 2 +-
- Source/cmake/WebKitMacros.cmake | 2 +-
- Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
- Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
- 6 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
-index 87153e35..cd0beed4 100644
---- a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
- WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
- WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
- include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(jsc ${JSC_SOURCES})
- target_link_libraries(jsc ${JSC_LIBRARIES})
-
-diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
-index e0dd9cd9..a2997f3e 100644
---- a/Source/WebCore/PlatformGTK.cmake
-+++ b/Source/WebCore/PlatformGTK.cmake
-@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
- target_include_directories(WebCorePlatformGTK2 PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- )
-- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
-+ target_include_directories(WebCorePlatformGTK2 PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK2_INCLUDE_DIRS}
- ${GDK2_INCLUDE_DIRS}
-@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
- target_include_directories(WebCorePlatformGTK PRIVATE
- ${WebCore_INCLUDE_DIRECTORIES}
- )
--target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
-+target_include_directories(WebCorePlatformGTK PRIVATE
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- ${GTK_INCLUDE_DIRS}
- ${GDK_INCLUDE_DIRS}
-@@ -206,7 +206,7 @@ include_directories(
- "${WEBCORE_DIR}/bindings/gobject/"
- )
-
--include_directories(SYSTEM
-+include_directories(
- ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
- )
-
-diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index 693bbdfe..20e3802f 100644
---- a/Source/WebKit/PlatformGTK.cmake
-+++ b/Source/WebKit/PlatformGTK.cmake
-@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
- target_include_directories(WebKitPluginProcess2 PRIVATE
- ${WebKitCommonIncludeDirectories}
- )
-- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
-+ target_include_directories(WebKitPluginProcess2 PRIVATE
- ${WebKitCommonSystemIncludeDirectories}
- ${GTK2_INCLUDE_DIRS}
- ${GDK2_INCLUDE_DIRS}
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 6d58d57e..976e2362 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
- ${${_target}_SOURCES}
- )
- target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
-- target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
-+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
- target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
- target_link_libraries(${_target} ${${_target}_LIBRARIES})
- set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
-diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
-index a0d32059..f259ade2 100644
---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
-+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
-@@ -59,7 +59,7 @@ endif ()
- add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
-
- include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
--include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
-+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
- add_executable(MiniBrowser ${MiniBrowser_SOURCES})
- target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-
-diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
-index 8dd0e146..d037fc35 100644
---- a/Tools/TestWebKitAPI/PlatformGTK.cmake
-+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
-@@ -22,7 +22,7 @@ include_directories(
- ${WEBKIT_DIR}/UIProcess/API/gtk
- )
-
--include_directories(SYSTEM
-+include_directories(
- ${GDK3_INCLUDE_DIRS}
- ${GLIB_INCLUDE_DIRS}
- ${GSTREAMER_INCLUDE_DIRS}
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch b/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
deleted file mode 100644
index bd4ac1e3538..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 8 May 2019 15:31:23 +0200
-Subject: [PATCH] gstreamer: add a missing format string
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-index e1e497ee..483fd65c 100644
---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
- WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
-
- #if GST_CHECK_VERSION(1, 14, 0)
-- GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
-+ GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
- #endif
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_NULL:
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
deleted file mode 100644
index 57ae48c1413..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Alberto Garcia <berto@igalia.com>
-Subject: Disable USE_GSTREAMER_GL is the package is not found
-Forwarded: no
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
-===================================================================
---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
-+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
-@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
- message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
- else ()
- if (NOT PC_GSTREAMER_GL_FOUND)
-- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
-+ set(USE_GSTREAMER_GL OFF)
-+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
- endif ()
- endif ()
- endif ()
diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
deleted file mode 100644
index 598b6b5df53..00000000000
--- a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build with clang on arm where char is unsigned
-
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- a/Source/WebCore/contentextensions/DFACombiner.cpp
-+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
-@@ -37,7 +37,7 @@ namespace WebCore {
- namespace ContentExtensions {
-
- class DFAMerger {
-- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
-+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
-
- enum class WhichDFA {
- A,
---- a/Source/WebCore/contentextensions/NFAToDFA.cpp
-+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
-@@ -41,9 +41,9 @@ namespace WebCore {
-
- namespace ContentExtensions {
-
--typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
--typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
--typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
-+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
-+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
-+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
- typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
- typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
-
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
similarity index 93%
rename from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
index 8c695ce9e75..77e51e7d290 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
@@ -17,16 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
file://x32_support.patch \
file://cross-compile.patch \
- file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
file://0001-Fix-build-with-musl.patch \
- file://detect-gstreamer-gl.patch \
file://include_array.patch \
- file://narrowing.patch \
- file://0001-gstreamer-add-a-missing-format-string.patch \
"
-SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
-SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8"
+SRC_URI[md5sum] = "08145bd6c1587230f135921c142bc150"
+SRC_URI[sha256sum] = "6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155"
inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
@@ -69,6 +65,7 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
-DENABLE_MINIBROWSER=ON \
-DPYTHON_EXECUTABLE=`which python3` \
+ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
"
# Javascript JIT is not supported on ARC
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1
2019-10-11 11:47 ` [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1 Alexander Kanavin
@ 2019-10-11 14:39 ` Khem Raj
0 siblings, 0 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-11 14:39 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Fri, Oct 11, 2019 at 4:49 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Drop patches:
> - 0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch - this
> has been a pain to rebase for a while as upstream keeps shifting and
> changing the code that needs to be modified. If the issue the patch
> is addressing is still relevant, please work with upstream to fix it
> at the source
>
IIRC this has already been fixed differently. So dropping it might be fine.
> - 0001-gstreamer-add-a-missing-format-string.patch, narrowing.patch
> are integrated upstream
>
> - detect-gstreamer-gl.patch is adjusting something that is better done
> from the yocto package configuration
>
> Add an option to disable an enabled-by-default sandbox that requires
> a component that oe-core does not have.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...acros-Append-to-I-and-not-to-isystem.patch | 125 ------------------
> ...streamer-add-a-missing-format-string.patch | 24 ----
> .../webkitgtk/detect-gstreamer-gl.patch | 20 ---
> .../webkit/webkitgtk/narrowing.patch | 31 -----
> ...ebkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} | 9 +-
> 5 files changed, 3 insertions(+), 206 deletions(-)
> delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
> delete mode 100644 meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
> delete mode 100644 meta/recipes-sato/webkit/webkitgtk/narrowing.patch
> rename meta/recipes-sato/webkit/{webkitgtk_2.24.4.bb => webkitgtk_2.26.1.bb} (93%)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> deleted file mode 100644
> index e71905d26a1..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
> +++ /dev/null
> @@ -1,125 +0,0 @@
> -From d1634e56a2589ec62325011bf77d480a67123b52 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 17 Apr 2016 12:35:41 -0700
> -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem
> -
> -gcc-6 has now introduced stdlib.h in libstdc++ for better
> -compliance and its including the C library stdlib.h using
> -include_next which is sensitive to order of system header
> -include paths. Its infact better to not tinker with the
> -system header include paths at all. Since adding /usr/include
> -to -system is redundant and compiler knows about it moreover
> -now with gcc6 it interferes with compiler's functioning
> -and ends up with compile errors e.g.
> -
> -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Upstream-Status: Pending
> -
> ----
> - Source/JavaScriptCore/shell/CMakeLists.txt | 2 +-
> - Source/WebCore/PlatformGTK.cmake | 6 +++---
> - Source/WebKit/PlatformGTK.cmake | 2 +-
> - Source/cmake/WebKitMacros.cmake | 2 +-
> - Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +-
> - Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +-
> - 6 files changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
> -index 87153e35..cd0beed4 100644
> ---- a/Source/JavaScriptCore/shell/CMakeLists.txt
> -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
> -@@ -36,7 +36,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
> - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES})
> - WEBKIT_WRAP_SOURCELIST(${TESTAPI_SOURCES})
> - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES} ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES})
> --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
> -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
> - add_executable(jsc ${JSC_SOURCES})
> - target_link_libraries(jsc ${JSC_LIBRARIES})
> -
> -diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
> -index e0dd9cd9..a2997f3e 100644
> ---- a/Source/WebCore/PlatformGTK.cmake
> -+++ b/Source/WebCore/PlatformGTK.cmake
> -@@ -164,7 +164,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
> - target_include_directories(WebCorePlatformGTK2 PRIVATE
> - ${WebCore_INCLUDE_DIRECTORIES}
> - )
> -- target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE
> -+ target_include_directories(WebCorePlatformGTK2 PRIVATE
> - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
> - ${GTK2_INCLUDE_DIRS}
> - ${GDK2_INCLUDE_DIRS}
> -@@ -190,7 +190,7 @@ add_dependencies(WebCorePlatformGTK WebCore)
> - target_include_directories(WebCorePlatformGTK PRIVATE
> - ${WebCore_INCLUDE_DIRECTORIES}
> - )
> --target_include_directories(WebCorePlatformGTK SYSTEM PRIVATE
> -+target_include_directories(WebCorePlatformGTK PRIVATE
> - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
> - ${GTK_INCLUDE_DIRS}
> - ${GDK_INCLUDE_DIRS}
> -@@ -206,7 +206,7 @@ include_directories(
> - "${WEBCORE_DIR}/bindings/gobject/"
> - )
> -
> --include_directories(SYSTEM
> -+include_directories(
> - ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
> - )
> -
> -diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
> -index 693bbdfe..20e3802f 100644
> ---- a/Source/WebKit/PlatformGTK.cmake
> -+++ b/Source/WebKit/PlatformGTK.cmake
> -@@ -664,7 +664,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
> - target_include_directories(WebKitPluginProcess2 PRIVATE
> - ${WebKitCommonIncludeDirectories}
> - )
> -- target_include_directories(WebKitPluginProcess2 SYSTEM PRIVATE
> -+ target_include_directories(WebKitPluginProcess2 PRIVATE
> - ${WebKitCommonSystemIncludeDirectories}
> - ${GTK2_INCLUDE_DIRS}
> - ${GDK2_INCLUDE_DIRS}
> -diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
> -index 6d58d57e..976e2362 100644
> ---- a/Source/cmake/WebKitMacros.cmake
> -+++ b/Source/cmake/WebKitMacros.cmake
> -@@ -152,7 +152,7 @@ macro(WEBKIT_FRAMEWORK _target)
> - ${${_target}_SOURCES}
> - )
> - target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
> -- target_include_directories(${_target} SYSTEM PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
> -+ target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_SYSTEM_INCLUDE_DIRECTORIES}>")
> - target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
> - target_link_libraries(${_target} ${${_target}_LIBRARIES})
> - set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
> -diff --git a/Tools/MiniBrowser/gtk/CMakeLists.txt b/Tools/MiniBrowser/gtk/CMakeLists.txt
> -index a0d32059..f259ade2 100644
> ---- a/Tools/MiniBrowser/gtk/CMakeLists.txt
> -+++ b/Tools/MiniBrowser/gtk/CMakeLists.txt
> -@@ -59,7 +59,7 @@ endif ()
> - add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
> -
> - include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
> --include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
> -+include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
> - add_executable(MiniBrowser ${MiniBrowser_SOURCES})
> - target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
> -
> -diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
> -index 8dd0e146..d037fc35 100644
> ---- a/Tools/TestWebKitAPI/PlatformGTK.cmake
> -+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake
> -@@ -22,7 +22,7 @@ include_directories(
> - ${WEBKIT_DIR}/UIProcess/API/gtk
> - )
> -
> --include_directories(SYSTEM
> -+include_directories(
> - ${GDK3_INCLUDE_DIRS}
> - ${GLIB_INCLUDE_DIRS}
> - ${GSTREAMER_INCLUDE_DIRS}
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch b/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
> deleted file mode 100644
> index bd4ac1e3538..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/0001-gstreamer-add-a-missing-format-string.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From 2d9687840b97186b80053dd262209e39455ac876 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Wed, 8 May 2019 15:31:23 +0200
> -Subject: [PATCH] gstreamer: add a missing format string
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - .../platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
> -index e1e497ee..483fd65c 100644
> ---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
> -+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
> -@@ -738,7 +738,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
> - WebKitWebSrc* src = WEBKIT_WEB_SRC(element);
> -
> - #if GST_CHECK_VERSION(1, 14, 0)
> -- GST_DEBUG_OBJECT(src, gst_state_change_get_name(transition));
> -+ GST_DEBUG_OBJECT(src, "%s", gst_state_change_get_name(transition));
> - #endif
> - switch (transition) {
> - case GST_STATE_CHANGE_READY_TO_NULL:
> diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch b/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
> deleted file mode 100644
> index 57ae48c1413..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/detect-gstreamer-gl.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -From: Alberto Garcia <berto@igalia.com>
> -Subject: Disable USE_GSTREAMER_GL is the package is not found
> -Forwarded: no
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
> -===================================================================
> ---- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
> -+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
> -@@ -43,7 +43,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
> - message(FATAL_ERROR "GStreamer 1.10 is needed for USE_GSTREAMER_GL.")
> - else ()
> - if (NOT PC_GSTREAMER_GL_FOUND)
> -- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
> -+ set(USE_GSTREAMER_GL OFF)
> -+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
> - endif ()
> - endif ()
> - endif ()
> diff --git a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch b/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
> deleted file mode 100644
> index 598b6b5df53..00000000000
> --- a/meta/recipes-sato/webkit/webkitgtk/narrowing.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -Fix build with clang on arm where char is unsigned
> -
> -Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=197087]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> ---- a/Source/WebCore/contentextensions/DFACombiner.cpp
> -+++ b/Source/WebCore/contentextensions/DFACombiner.cpp
> -@@ -37,7 +37,7 @@ namespace WebCore {
> - namespace ContentExtensions {
> -
> - class DFAMerger {
> -- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
> -+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
> -
> - enum class WhichDFA {
> - A,
> ---- a/Source/WebCore/contentextensions/NFAToDFA.cpp
> -+++ b/Source/WebCore/contentextensions/NFAToDFA.cpp
> -@@ -41,9 +41,9 @@ namespace WebCore {
> -
> - namespace ContentExtensions {
> -
> --typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
> --typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
> --typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
> -+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
> -+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
> -+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
> - typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
> - typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
> -
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
> similarity index 93%
> rename from meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
> rename to meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
> index 8c695ce9e75..77e51e7d290 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.24.4.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.26.1.bb
> @@ -17,16 +17,12 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
> file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
> file://x32_support.patch \
> file://cross-compile.patch \
> - file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
> file://0001-Fix-build-with-musl.patch \
> - file://detect-gstreamer-gl.patch \
> file://include_array.patch \
> - file://narrowing.patch \
> - file://0001-gstreamer-add-a-missing-format-string.patch \
> "
>
> -SRC_URI[md5sum] = "c214963d8c0e7d83460da04a0d8dda87"
> -SRC_URI[sha256sum] = "8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8"
> +SRC_URI[md5sum] = "08145bd6c1587230f135921c142bc150"
> +SRC_URI[sha256sum] = "6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155"
>
> inherit cmake pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc
>
> @@ -69,6 +65,7 @@ EXTRA_OECMAKE = " \
> ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \
> -DENABLE_MINIBROWSER=ON \
> -DPYTHON_EXECUTABLE=`which python3` \
> + -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
> "
>
> # Javascript JIT is not supported on ARC
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (7 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 19:30 ` akuster808
2019-10-11 11:47 ` [PATCH 11/19] libdazzle: upgrade 3.32.3 -> 3.34.1 Alexander Kanavin
` (8 subsequent siblings)
17 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 2 +-
.../gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} (93%)
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
index 8c9bc954420..5ca4e3e086d 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,4 +1,4 @@
-From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
+From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 5 Sep 2016 22:25:44 +0100
Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
similarity index 93%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
index 4f97ce06333..50d4d99722f 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
-SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
-SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
+SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae"
+SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
file://conditionaltests.patch \
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32
2019-10-11 11:47 ` [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32 Alexander Kanavin
@ 2019-10-11 19:30 ` akuster808
2019-10-11 19:39 ` Alexander Kanavin
0 siblings, 1 reply; 40+ messages in thread
From: akuster808 @ 2019-10-11 19:30 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On 10/11/19 4:47 AM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 2 +-
> .../gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
> rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.31.bb => gtk-doc_1.32.bb} (93%)
>
> diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> index 8c9bc954420..5ca4e3e086d 100644
> --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> @@ -1,4 +1,4 @@
> -From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
> +From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
> From: Ross Burton <ross.burton@intel.com>
> Date: Mon, 5 Sep 2016 22:25:44 +0100
Why did the patch change?
> Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
> diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
> similarity index 93%
> rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
> rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
> index 4f97ce06333..50d4d99722f 100644
> --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
> +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb
> @@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
> PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
> PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
>
> -SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
> -SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
> +SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae"
> +SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c"
> SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
> file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
> file://conditionaltests.patch \
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32
2019-10-11 19:30 ` akuster808
@ 2019-10-11 19:39 ` Alexander Kanavin
2019-10-12 10:12 ` Adrian Bunk
0 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 19:39 UTC (permalink / raw)
To: akuster808; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
On Fri, 11 Oct 2019 at 21:30, akuster808 <akuster808@gmail.com> wrote:
> > --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > @@ -1,4 +1,4 @@
> > -From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
> > +From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
> > From: Ross Burton <ross.burton@intel.com>
> > Date: Mon, 5 Sep 2016 22:25:44 +0100
>
> Why did the patch change?
>
rebasing patches with 'devtool upgrade' can do this. I usually don't trim
such non-changes as they're obvious and harmless.
Alex
[-- Attachment #2: Type: text/html, Size: 1107 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32
2019-10-11 19:39 ` Alexander Kanavin
@ 2019-10-12 10:12 ` Adrian Bunk
0 siblings, 0 replies; 40+ messages in thread
From: Adrian Bunk @ 2019-10-12 10:12 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Fri, Oct 11, 2019 at 09:39:07PM +0200, Alexander Kanavin wrote:
> On Fri, 11 Oct 2019 at 21:30, akuster808 <akuster808@gmail.com> wrote:
>
> > > --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > > +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
> > > @@ -1,4 +1,4 @@
> > > -From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
> > > +From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001
> > > From: Ross Burton <ross.burton@intel.com>
> > > Date: Mon, 5 Sep 2016 22:25:44 +0100
> >
> > Why did the patch change?
>
> rebasing patches with 'devtool upgrade' can do this. I usually don't trim
> such non-changes as they're obvious and harmless.
They can be a pain when cherry-picking changes for backporting.
> Alex
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 11/19] libdazzle: upgrade 3.32.3 -> 3.34.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (8 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 12/19] libsecret: upgrade 0.19.0 -> 0.19.1 Alexander Kanavin
` (7 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../libdazzle/{libdazzle_3.32.3.bb => libdazzle_3.34.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libdazzle/{libdazzle_3.32.3.bb => libdazzle_3.34.1.bb} (73%)
diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
similarity index 73%
rename from meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb
rename to meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
index e1a11830070..cf61ed5016f 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.32.3.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.34.1.bb
@@ -7,8 +7,8 @@ inherit gnomebase upstream-version-is-even vala distro_features_check gobject-in
DEPENDS = "glib-2.0-native glib-2.0 gtk+3"
-SRC_URI[archive.md5sum] = "b6da085649dcda2795e6980a84667950"
-SRC_URI[archive.sha256sum] = "6c8d9b1514b5f6422107596f4145b89b8f2a99abef6383e086dfcd28c28667e8"
+SRC_URI[archive.md5sum] = "e796a92dd3f529616ed388c15208359b"
+SRC_URI[archive.sha256sum] = "3d981cbb9d9bb87bfaff7bfd44d9847223b3ef81e69225e4d1f6ac725a669505"
GIR_MESON_OPTION = 'with_introspection'
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 12/19] libsecret: upgrade 0.19.0 -> 0.19.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (9 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 11/19] libdazzle: upgrade 3.32.3 -> 3.34.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 13/19] mpg123: upgrade 1.25.11 -> 1.25.12 Alexander Kanavin
` (6 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../libsecret/{libsecret_0.19.0.bb => libsecret_0.19.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libsecret/{libsecret_0.19.0.bb => libsecret_0.19.1.bb} (81%)
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb b/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
similarity index 81%
rename from meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
rename to meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
index 7da8e90084d..0d76075239f 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.19.0.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
@@ -8,8 +8,8 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-SRC_URI[archive.md5sum] = "483d293e73e7257c6d9fc18579b0e1ea"
-SRC_URI[archive.sha256sum] = "8049b09a4e737911aa647e50aee3d06b5db7aa902608ca43a0dd10d83e1d67f9"
+SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8"
+SRC_URI[archive.sha256sum] = "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
# http://errors.yoctoproject.org/Errors/Details/20228/
ARM_INSTRUCTION_SET_armv4 = "arm"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 13/19] mpg123: upgrade 1.25.11 -> 1.25.12
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (10 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 12/19] libsecret: upgrade 0.19.0 -> 0.19.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 14/19] p11-kit: upgrade 0.23.16.1 -> 0.23.18.1 Alexander Kanavin
` (5 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/mpg123/{mpg123_1.25.11.bb => mpg123_1.25.12.bb} (94%)
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb b/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
similarity index 94%
rename from meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
index d063ef5c599..a18b2f44174 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.25.11.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.12.bb
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \
file://sdl2.patch"
-SRC_URI[md5sum] = "64749512a6fdc117227abe13fee4cc36"
-SRC_URI[sha256sum] = "df063307faa27c7d9efe63d2139b1564cfc7cdbb7c6f449c89ef8faabfa0eab2"
+SRC_URI[md5sum] = "ddb38254966eb38c77f220d456a1839d"
+SRC_URI[sha256sum] = "1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1"
inherit autotools pkgconfig
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 14/19] p11-kit: upgrade 0.23.16.1 -> 0.23.18.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (11 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 13/19] mpg123: upgrade 1.25.11 -> 1.25.12 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 15/19] vala: upgrade 0.44.7 -> 0.46.3 Alexander Kanavin
` (4 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Drop the patch that has been merged upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-languages-for-which-upstream-does-n.patch | 29 -------------------
...-kit_0.23.16.1.bb => p11-kit_0.23.18.1.bb} | 6 ++--
2 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100644 meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
rename meta/recipes-support/p11-kit/{p11-kit_0.23.16.1.bb => p11-kit_0.23.18.1.bb} (89%)
diff --git a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
deleted file mode 100644
index e902b0b522f..00000000000
--- a/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c6bb4b99af39daa3221c3bdc0686987ae0f31693 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Wed, 31 Jan 2018 16:47:44 +0200
-Subject: [PATCH] LINGUAS: drop the languages for which upstream does not
- supply .po files
-
-Regenerating them proved to be too painful.
-Upstream has been notified: https://github.com/p11-glue/p11-kit/issues/127
-
-Upstream-Status: Inappropriate [missing upstream distribution files]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- po/LINGUAS | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/po/LINGUAS b/po/LINGUAS
-index 767a806c2e20..6ab48001c409 100644
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -12,8 +12,6 @@ cy
- da
- de
- el
--en@boldquot
--en@quot
- en_GB
- eo
- es
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
similarity index 89%
rename from meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
index 54455da1bb7..119d8365a18 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.23.18.1.bb
@@ -6,10 +6,8 @@ inherit autotools gettext pkgconfig gtk-doc
DEPENDS = "libtasn1 libffi"
-SRC_URI = "git://github.com/p11-glue/p11-kit \
- file://0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch \
- "
-SRCREV = "c689917b393379d288b868f70b2f7b7f6aafe430"
+SRC_URI = "git://github.com/p11-glue/p11-kit"
+SRCREV = "b0ebe7555c291808db29377ba79cb8326301f0a6"
S = "${WORKDIR}/git"
AUTOTOOLS_AUXDIR = "${S}/build/litter"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 15/19] vala: upgrade 0.44.7 -> 0.46.3
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (12 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 14/19] p11-kit: upgrade 0.23.16.1 -> 0.23.18.1 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 16/19] meson: update to 0.52.0 Alexander Kanavin
` (3 subsequent siblings)
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/vala/{vala_0.44.7.bb => vala_0.46.3.bb} (57%)
diff --git a/meta/recipes-devtools/vala/vala_0.44.7.bb b/meta/recipes-devtools/vala/vala_0.46.3.bb
similarity index 57%
rename from meta/recipes-devtools/vala/vala_0.44.7.bb
rename to meta/recipes-devtools/vala/vala_0.46.3.bb
index 807ca7a2139..eda5738c066 100644
--- a/meta/recipes-devtools/vala/vala_0.44.7.bb
+++ b/meta/recipes-devtools/vala/vala_0.46.3.bb
@@ -4,5 +4,5 @@ SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pat
file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
"
-SRC_URI[md5sum] = "27fd30535c51af5b87b0e7ffdbd906ef"
-SRC_URI[sha256sum] = "bf1ff4f59d5de2d626e98e98ef81cb75dc1e6a27610a7de4133597c430f1bd7c"
+SRC_URI[md5sum] = "809ddac69b039ef509b61993c848613f"
+SRC_URI[sha256sum] = "e29c2b1f108dc22c91bb501975a77c938aef079ca7875e1fbf41191e22cc57e3"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 16/19] meson: update to 0.52.0
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (13 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 15/19] vala: upgrade 0.44.7 -> 0.46.3 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-13 0:20 ` Khem Raj
2019-10-11 11:47 ` [PATCH 17/19] libmodulemd-v1: introduce the recipe Alexander Kanavin
` (2 subsequent siblings)
17 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Drop backported patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 7 +--
...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
.../0001-Make-CPU-family-warnings-fatal.patch | 8 +--
...etect-windows-also-if-the-system-str.patch | 29 -----------
...sues-that-arise-when-cross-compiling.patch | 8 +--
...pport-building-allarch-recipes-again.patch | 4 +-
.../meson/meson/0003-native_bindir.patch | 20 ++++----
.../meson/meson/vala-cross-compile.patch | 50 -------------------
.../{meson_0.51.2.bb => meson_0.52.0.bb} | 1 -
...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} | 0
10 files changed, 22 insertions(+), 133 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
delete mode 100644 meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-compile.patch
rename meta/recipes-devtools/meson/{meson_0.51.2.bb => meson_0.52.0.bb} (97%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb => nativesdk-meson_0.52.0.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 8219d87c741..ae0091c051c 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -14,14 +14,11 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
file://cross-prop-default.patch \
- file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
- file://0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch \
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
- file://vala-cross-compile.patch \
"
-SRC_URI[sha256sum] = "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
-SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
+SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
+SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
deleted file mode 100644
index a5dbb81b088..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane@gmail.com>
-Date: Sun, 6 Oct 2019 15:17:32 +0300
-Subject: [PATCH] Cross build is defined by the existance of a cross file.
-
----
- mesonbuild/environment.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index e5d041b4..03c65688 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -611,7 +611,7 @@ class Environment:
- self.first_invocation = True
-
- def is_cross_build(self) -> bool:
-- return not self.machines.matches_build_machine(MachineChoice.HOST)
-+ return self.coredata.is_cross_build()
-
- def dump_coredata(self):
- return coredata.save(self.coredata, self.get_build_dir())
---
-2.20.1
-
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 444fc081686..fc55dcacf6d 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,4 +1,4 @@
-From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00 2001
+From c07d29b715209cd5d75b142a00a540d45b00c36d 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
@@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..86b350b 100644
+index a59cd89..17de654 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -186,7 +186,7 @@ class MachineInfo:
@@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 0cfdf9c..40aa189 100644
+index 3704921..f1988f2 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
-@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'parisc'
if trial not in known_cpu_families:
diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
deleted file mode 100644
index 2faeda2e711..00000000000
--- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-system-str.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 25 Mar 2019 17:17:06 +0100
-Subject: [PATCH] environment.py: detect windows also if the system string
- contains 'mingw'
-
-Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- mesonbuild/envconfig.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 03c6346..a59cd89 100644
---- a/mesonbuild/envconfig.py
-+++ b/mesonbuild/envconfig.py
-@@ -198,7 +198,7 @@ class MachineInfo:
- """
- Machine is windows?
- """
-- return self.system in {'windows', 'mingw'}
-+ return self.system == 'windows' or 'mingw' in self.system
-
- def is_cygwin(self) -> bool:
- """
---
-2.17.1
-
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 7c3238bf91a..471f1500daa 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 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00 2001
+From d3ef01a4208a801acad380a4aaceb6a21f8fa603 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 bf49770..7c5a363 100644
+index bcf77b9..6a4b472 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
-@@ -972,6 +972,10 @@ This will become a hard error in the future.''')
- '--mode=' + mode]
+@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
+ args.append('--{}={}'.format(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/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index 8ad86a46e99..b8837d77b64 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,4 +1,4 @@
-From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00 2001
+From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 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
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 86b350b..aa426ca 100644
+index 17de654..2d2deef 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 57de598d2f1..76cc4931d63 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 ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00 2001
+From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 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
@@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 21da8e2..7d1ef85 100644
+index 3c55a56..eb52fd1 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
-@@ -155,7 +155,7 @@ class Dependency:
+@@ -185,7 +185,7 @@ class Dependency:
def get_exe_args(self, compiler):
return []
@@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
def get_configtool_variable(self, variable_name):
-@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
+@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
self.sources = sources
self.ext_deps = ext_deps
@@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency')
-@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
# Always copy the environment since we're going to modify it
# with pkg-config variables
if env is None:
-@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
targs = tuple(args)
cache = PkgConfigDependency.pkgbin_cache
if (self.pkgbin, targs, fenv) not in cache:
@@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args):
-@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
- (self.name, out_raw))
- self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
+@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
+ mlog.warning('Could not determine complete list of dependencies for %s' % self.name)
+ self.link_args, self.raw_link_args = self._search_libs(out, out_raw, out_all)
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
-@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
diff --git a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch b/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
deleted file mode 100644
index 816f810c054..00000000000
--- a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00 2001
-From: James Westman <flyingpimonster@flyingpimonster.net>
-Date: Mon, 24 Jun 2019 12:04:12 -0500
-Subject: [PATCH] Fix two errors when cross-compiling with Vala
-
-- AttributeError: 'ValaCompiler' object has no attribute 'get_program_dirs'
-
- Fixed by adding a `get_program_dirs()` function to the base Compiler
- class, to match `get_library_dirs()`
-
-- KeyError: 'vala_COMPILER'
-
- Fixed by creating the Vala compile rules for all machines, not just
- the build machine.
-
-Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- mesonbuild/backend/ninjabackend.py | 3 +--
- mesonbuild/compilers/compilers.py | 3 +++
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
-index a454e6ab5f..b830e377e4 100644
---- a/mesonbuild/backend/ninjabackend.py
-+++ b/mesonbuild/backend/ninjabackend.py
-@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname, compiler):
- self.generate_cs_compile_rule(compiler)
- return
- if langname == 'vala':
-- if self.environment.machines.matches_build_machine(compiler.for_machine):
-- self.generate_vala_compile_rules(compiler)
-+ self.generate_vala_compile_rules(compiler)
- return
- if langname == 'rust':
- self.generate_rust_compile_rules(compiler)
-diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
-index 5855de71c8..86c1e33407 100644
---- a/mesonbuild/compilers/compilers.py
-+++ b/mesonbuild/compilers/compilers.py
-@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
- def get_library_dirs(self, *args, **kwargs):
- return ()
-
-+ def get_program_dirs(self, *args, **kwargs):
-+ return ()
-+
- def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
- raise EnvironmentException(
- 'Language {} does not support has_multi_arguments.'.format(
diff --git a/meta/recipes-devtools/meson/meson_0.51.2.bb b/meta/recipes-devtools/meson/meson_0.52.0.bb
similarity index 97%
rename from meta/recipes-devtools/meson/meson_0.51.2.bb
rename to meta/recipes-devtools/meson/meson_0.52.0.bb
index de9b905c12b..897fa148d94 100644
--- a/meta/recipes-devtools/meson/meson_0.51.2.bb
+++ b/meta/recipes-devtools/meson/meson_0.52.0.bb
@@ -1,4 +1,3 @@
include meson.inc
BBCLASSEXTEND = "native"
-
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-11 11:47 ` [PATCH 16/19] meson: update to 0.52.0 Alexander Kanavin
@ 2019-10-13 0:20 ` Khem Raj
2019-10-17 13:15 ` Khem Raj
0 siblings, 1 reply; 40+ messages in thread
From: Khem Raj @ 2019-10-13 0:20 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core
On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> Drop backported patches.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/recipes-devtools/meson/meson.inc | 7 +--
> ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
> .../0001-Make-CPU-family-warnings-fatal.patch | 8 +--
> ...etect-windows-also-if-the-system-str.patch | 29 -----------
> ...sues-that-arise-when-cross-compiling.patch | 8 +--
> ...pport-building-allarch-recipes-again.patch | 4 +-
> .../meson/meson/0003-native_bindir.patch | 20 ++++----
> .../meson/meson/vala-cross-compile.patch | 50 ---------------
meson 0.52.x seems to be exposing the dconf build issue.
https://errors.yoctoproject.org/Errors/Details/273492/
also reported here
https://gitlab.gnome.org/GNOME/dconf/issues/59
> ----
> .../{meson_0.51.2.bb => meson_0.52.0.bb} | 1 -
> ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} | 0
> 10 files changed, 22 insertions(+), 133 deletions(-)
> delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
> build-is-defined-by-the-existance-of-a-cross-f.patch
> delete mode 100644 meta/recipes-devtools/meson/meson/0001-
> environment.py-detect-windows-also-if-the-system-str.patch
> delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
> compile.patch
> rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
> meson_0.52.0.bb} (97%)
> rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>
> nativesdk-meson_0.52.0.bb} (100%)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> devtools/meson/meson.inc
> index 8219d87c741..ae0091c051c 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -14,14 +14,11 @@ SRC_URI = "
> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> file://0001-python-module-do-not-manipulate-the-
> environment-when.patch \
> file://disable-rpath-handling.patch \
> file://cross-prop-default.patch \
> - file://0001-environment.py-detect-windows-also-if-the-
> system-str.patch \
> - file://0001-Cross-build-is-defined-by-the-existance-of-a-
> cross-f.patch \
> file://0001-mesonbuild-environment.py-check-environment-
> for-vari.patch \
> file://0001-modules-python.py-do-not-substitute-python-s-
> install.patch \
> - file://vala-cross-compile.patch \
> "
> -SRC_URI[sha256sum] =
> "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
> -SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
> +SRC_URI[sha256sum] =
> "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
> +SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
>
> SRC_URI_append_class-native = " \
> file://0001-Make-CPU-family-warnings-fatal.patch \
> diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-
> defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-
> devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-
> a-cross-f.patch
> deleted file mode 100644
> index a5dbb81b088..00000000000
> --- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-
> by-the-existance-of-a-cross-f.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -Upstream-Status: Backport
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00
> 2001
> -From: Jussi Pakkanen <jpakkane@gmail.com>
> -Date: Sun, 6 Oct 2019 15:17:32 +0300
> -Subject: [PATCH] Cross build is defined by the existance of a cross
> file.
> -
> ----
> - mesonbuild/environment.py | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> -index e5d041b4..03c65688 100644
> ---- a/mesonbuild/environment.py
> -+++ b/mesonbuild/environment.py
> -@@ -611,7 +611,7 @@ class Environment:
> - self.first_invocation = True
> -
> - def is_cross_build(self) -> bool:
> -- return not
> self.machines.matches_build_machine(MachineChoice.HOST)
> -+ return self.coredata.is_cross_build()
> -
> - def dump_coredata(self):
> - return coredata.save(self.coredata, self.get_build_dir())
> ---
> -2.20.1
> -
> 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 444fc081686..fc55dcacf6d 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,4 +1,4 @@
> -From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00
> 2001
> +From c07d29b715209cd5d75b142a00a540d45b00c36d 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
> @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> -index 03c6346..86b350b 100644
> +index a59cd89..17de654 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
> @@ -186,7 +186,7 @@ class MachineInfo:
> @@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
> endian = literal['endian']
> if endian not in ('little', 'big'):
> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> -index 0cfdf9c..40aa189 100644
> +index 3704921..f1988f2 100644
> --- a/mesonbuild/environment.py
> +++ b/mesonbuild/environment.py
> -@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
> -> str:
> +@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
> -> str:
> trial = 'parisc'
>
> if trial not in known_cpu_families:
> diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-
> detect-windows-also-if-the-system-str.patch b/meta/recipes-
> devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-
> system-str.patch
> deleted file mode 100644
> index 2faeda2e711..00000000000
> --- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-
> windows-also-if-the-system-str.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00
> 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Mon, 25 Mar 2019 17:17:06 +0100
> -Subject: [PATCH] environment.py: detect windows also if the system
> string
> - contains 'mingw'
> -
> -Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -
> ----
> - mesonbuild/envconfig.py | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> -index 03c6346..a59cd89 100644
> ---- a/mesonbuild/envconfig.py
> -+++ b/mesonbuild/envconfig.py
> -@@ -198,7 +198,7 @@ class MachineInfo:
> - """
> - Machine is windows?
> - """
> -- return self.system in {'windows', 'mingw'}
> -+ return self.system == 'windows' or 'mingw' in self.system
> -
> - def is_cygwin(self) -> bool:
> - """
> ---
> -2.17.1
> -
> 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 7c3238bf91a..471f1500daa 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 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00
> 2001
> +From d3ef01a4208a801acad380a4aaceb6a21f8fa603 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 bf49770..7c5a363 100644
> +index bcf77b9..6a4b472 100644
> --- a/mesonbuild/modules/gnome.py
> +++ b/mesonbuild/modules/gnome.py
> -@@ -972,6 +972,10 @@ This will become a hard error in the
> future.''')
> - '--mode=' + mode]
> +@@ -974,6 +974,10 @@ This will become a hard error in the
> future.''')
> + args.append('--{}={}'.format(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/0002-Support-building-
> allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
> Support-building-allarch-recipes-again.patch
> index 8ad86a46e99..b8837d77b64 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,4 +1,4 @@
> -From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00
> 2001
> +From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 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
> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <
> peter.kjellerstedt@axis.com>
> 1 file changed, 1 insertion(+)
>
> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> -index 86b350b..aa426ca 100644
> +index 17de654..2d2deef 100644
> --- a/mesonbuild/envconfig.py
> +++ b/mesonbuild/envconfig.py
> @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> diff --git a/meta/recipes-devtools/meson/meson/0003-
> native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-
> native_bindir.patch
> index 57de598d2f1..76cc4931d63 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 ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00
> 2001
> +From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 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
> @@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <
> ricardo.ribalda@gmail.com>
> 2 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/mesonbuild/dependencies/base.py
> b/mesonbuild/dependencies/base.py
> -index 21da8e2..7d1ef85 100644
> +index 3c55a56..eb52fd1 100644
> --- a/mesonbuild/dependencies/base.py
> +++ b/mesonbuild/dependencies/base.py
> -@@ -155,7 +155,7 @@ class Dependency:
> +@@ -185,7 +185,7 @@ class Dependency:
> def get_exe_args(self, compiler):
> return []
>
> @@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
> raise DependencyException('{!r} is not a pkgconfig
> dependency'.format(self.name))
>
> def get_configtool_variable(self, variable_name):
> -@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
> +@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
> self.sources = sources
> self.ext_deps = ext_deps
>
> @@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
> raise DependencyException('Method
> "get_pkgconfig_variable()" is '
> 'invalid for an internal
> dependency')
>
> -@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> return s.format(self.__class__.__name__, self.name,
> self.is_found,
> self.version_reqs)
>
> @@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
> # Always copy the environment since we're going to modify
> it
> # with pkg-config variables
> if env is None:
> -@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> targs = tuple(args)
> cache = PkgConfigDependency.pkgbin_cache
> if (self.pkgbin, targs, fenv) not in cache:
> @@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
> return cache[(self.pkgbin, targs, fenv)]
>
> def _convert_mingw_paths(self, args):
> -@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
> - (self.name, out_raw))
> - self.link_args, self.raw_link_args = self._search_libs(out,
> out_raw)
> +@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
> + mlog.warning('Could not determine complete list of
> dependencies for %s' % self.name)
> + self.link_args, self.raw_link_args = self._search_libs(out,
> out_raw, out_all)
>
> - def get_pkgconfig_variable(self, variable_name, kwargs):
> + def get_pkgconfig_variable(self, variable_name, kwargs,
> use_native=False):
> options = ['--variable=' + variable_name, self.name]
>
> if 'define_variable' in kwargs:
> -@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
>
> options = ['--define-variable=' + '='.join(definition)]
> + options
>
> diff --git a/meta/recipes-devtools/meson/meson/vala-cross-
> compile.patch b/meta/recipes-devtools/meson/meson/vala-cross-
> compile.patch
> deleted file mode 100644
> index 816f810c054..00000000000
> --- a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00
> 2001
> -From: James Westman <flyingpimonster@flyingpimonster.net>
> -Date: Mon, 24 Jun 2019 12:04:12 -0500
> -Subject: [PATCH] Fix two errors when cross-compiling with Vala
> -
> -- AttributeError: 'ValaCompiler' object has no attribute
> 'get_program_dirs'
> -
> - Fixed by adding a `get_program_dirs()` function to the base
> Compiler
> - class, to match `get_library_dirs()`
> -
> -- KeyError: 'vala_COMPILER'
> -
> - Fixed by creating the Vala compile rules for all machines, not
> just
> - the build machine.
> -
> -Upstream-Status: Backport [
> https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d
> ]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - mesonbuild/backend/ninjabackend.py | 3 +--
> - mesonbuild/compilers/compilers.py | 3 +++
> - 2 files changed, 4 insertions(+), 2 deletions(-)
> -
> -diff --git a/mesonbuild/backend/ninjabackend.py
> b/mesonbuild/backend/ninjabackend.py
> -index a454e6ab5f..b830e377e4 100644
> ---- a/mesonbuild/backend/ninjabackend.py
> -+++ b/mesonbuild/backend/ninjabackend.py
> -@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname,
> compiler):
> - self.generate_cs_compile_rule(compiler)
> - return
> - if langname == 'vala':
> -- if
> self.environment.machines.matches_build_machine(compiler.for_machine)
> :
> -- self.generate_vala_compile_rules(compiler)
> -+ self.generate_vala_compile_rules(compiler)
> - return
> - if langname == 'rust':
> - self.generate_rust_compile_rules(compiler)
> -diff --git a/mesonbuild/compilers/compilers.py
> b/mesonbuild/compilers/compilers.py
> -index 5855de71c8..86c1e33407 100644
> ---- a/mesonbuild/compilers/compilers.py
> -+++ b/mesonbuild/compilers/compilers.py
> -@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
> - def get_library_dirs(self, *args, **kwargs):
> - return ()
> -
> -+ def get_program_dirs(self, *args, **kwargs):
> -+ return ()
> -+
> - def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
> - raise EnvironmentException(
> - 'Language {} does not support
> has_multi_arguments.'.format(
> diff --git a/meta/recipes-devtools/meson/meson_0.51.2.bb
> b/meta/recipes-devtools/meson/meson_0.52.0.bb
> similarity index 97%
> rename from meta/recipes-devtools/meson/meson_0.51.2.bb
> rename to meta/recipes-devtools/meson/meson_0.52.0.bb
> index de9b905c12b..897fa148d94 100644
> --- a/meta/recipes-devtools/meson/meson_0.51.2.bb
> +++ b/meta/recipes-devtools/meson/meson_0.52.0.bb
> @@ -1,4 +1,3 @@
> include meson.inc
>
> BBCLASSEXTEND = "native"
> -
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> b/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-13 0:20 ` Khem Raj
@ 2019-10-17 13:15 ` Khem Raj
2019-10-17 23:31 ` Andreas Müller
2019-10-18 18:49 ` Alexander Kanavin
0 siblings, 2 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-17 13:15 UTC (permalink / raw)
To: Alexander Kanavin,
Patches and discussions about the oe-core layer
On Sat, Oct 12, 2019 at 5:20 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> > Drop backported patches.
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > meta/recipes-devtools/meson/meson.inc | 7 +--
> > ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
> > .../0001-Make-CPU-family-warnings-fatal.patch | 8 +--
> > ...etect-windows-also-if-the-system-str.patch | 29 -----------
> > ...sues-that-arise-when-cross-compiling.patch | 8 +--
> > ...pport-building-allarch-recipes-again.patch | 4 +-
> > .../meson/meson/0003-native_bindir.patch | 20 ++++----
> > .../meson/meson/vala-cross-compile.patch | 50 ---------------
>
> meson 0.52.x seems to be exposing the dconf build issue.
>
> https://errors.yoctoproject.org/Errors/Details/273492/
>
> also reported here
> https://gitlab.gnome.org/GNOME/dconf/issues/59
>
Regardless of this report, this is now merged and I don't see any
resolution either of a followup
from the submitter or any other developer. This is quite disheartening
since it takes a lot of effort to find
these issues and reports. we should try to be considerate of the
layers who are trying to keep up with
OE-Core, like this we won't be able to improve the quality of these
layers. I understand that there are no breakages seen in OE-cor but we
should encourage more
of other layers to test master and especially if there are reports
than it would be good to heed to them.
> > ----
> > .../{meson_0.51.2.bb => meson_0.52.0.bb} | 1 -
> > ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} | 0
> > 10 files changed, 22 insertions(+), 133 deletions(-)
> > delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
> > build-is-defined-by-the-existance-of-a-cross-f.patch
> > delete mode 100644 meta/recipes-devtools/meson/meson/0001-
> > environment.py-detect-windows-also-if-the-system-str.patch
> > delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
> > compile.patch
> > rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
> > meson_0.52.0.bb} (97%)
> > rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>
> > nativesdk-meson_0.52.0.bb} (100%)
> >
> > diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> > devtools/meson/meson.inc
> > index 8219d87c741..ae0091c051c 100644
> > --- a/meta/recipes-devtools/meson/meson.inc
> > +++ b/meta/recipes-devtools/meson/meson.inc
> > @@ -14,14 +14,11 @@ SRC_URI = "
> > https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> > file://0001-python-module-do-not-manipulate-the-
> > environment-when.patch \
> > file://disable-rpath-handling.patch \
> > file://cross-prop-default.patch \
> > - file://0001-environment.py-detect-windows-also-if-the-
> > system-str.patch \
> > - file://0001-Cross-build-is-defined-by-the-existance-of-a-
> > cross-f.patch \
> > file://0001-mesonbuild-environment.py-check-environment-
> > for-vari.patch \
> > file://0001-modules-python.py-do-not-substitute-python-s-
> > install.patch \
> > - file://vala-cross-compile.patch \
> > "
> > -SRC_URI[sha256sum] =
> > "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
> > -SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
> > +SRC_URI[sha256sum] =
> > "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
> > +SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
> >
> > SRC_URI_append_class-native = " \
> > file://0001-Make-CPU-family-warnings-fatal.patch \
> > diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-
> > defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-
> > devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-
> > a-cross-f.patch
> > deleted file mode 100644
> > index a5dbb81b088..00000000000
> > --- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-
> > by-the-existance-of-a-cross-f.patch
> > +++ /dev/null
> > @@ -1,28 +0,0 @@
> > -Upstream-Status: Backport
> > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > -
> > -From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00
> > 2001
> > -From: Jussi Pakkanen <jpakkane@gmail.com>
> > -Date: Sun, 6 Oct 2019 15:17:32 +0300
> > -Subject: [PATCH] Cross build is defined by the existance of a cross
> > file.
> > -
> > ----
> > - mesonbuild/environment.py | 2 +-
> > - 2 files changed, 2 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > -index e5d041b4..03c65688 100644
> > ---- a/mesonbuild/environment.py
> > -+++ b/mesonbuild/environment.py
> > -@@ -611,7 +611,7 @@ class Environment:
> > - self.first_invocation = True
> > -
> > - def is_cross_build(self) -> bool:
> > -- return not
> > self.machines.matches_build_machine(MachineChoice.HOST)
> > -+ return self.coredata.is_cross_build()
> > -
> > - def dump_coredata(self):
> > - return coredata.save(self.coredata, self.get_build_dir())
> > ---
> > -2.20.1
> > -
> > 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 444fc081686..fc55dcacf6d 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,4 +1,4 @@
> > -From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00
> > 2001
> > +From c07d29b715209cd5d75b142a00a540d45b00c36d 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
> > @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
> > 2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > -index 03c6346..86b350b 100644
> > +index a59cd89..17de654 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> > @@ -186,7 +186,7 @@ class MachineInfo:
> > @@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
> > endian = literal['endian']
> > if endian not in ('little', 'big'):
> > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > -index 0cfdf9c..40aa189 100644
> > +index 3704921..f1988f2 100644
> > --- a/mesonbuild/environment.py
> > +++ b/mesonbuild/environment.py
> > -@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
> > -> str:
> > +@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
> > -> str:
> > trial = 'parisc'
> >
> > if trial not in known_cpu_families:
> > diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-
> > detect-windows-also-if-the-system-str.patch b/meta/recipes-
> > devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-
> > system-str.patch
> > deleted file mode 100644
> > index 2faeda2e711..00000000000
> > --- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-
> > windows-also-if-the-system-str.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00
> > 2001
> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > -Date: Mon, 25 Mar 2019 17:17:06 +0100
> > -Subject: [PATCH] environment.py: detect windows also if the system
> > string
> > - contains 'mingw'
> > -
> > -Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > -
> > ----
> > - mesonbuild/envconfig.py | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > -index 03c6346..a59cd89 100644
> > ---- a/mesonbuild/envconfig.py
> > -+++ b/mesonbuild/envconfig.py
> > -@@ -198,7 +198,7 @@ class MachineInfo:
> > - """
> > - Machine is windows?
> > - """
> > -- return self.system in {'windows', 'mingw'}
> > -+ return self.system == 'windows' or 'mingw' in self.system
> > -
> > - def is_cygwin(self) -> bool:
> > - """
> > ---
> > -2.17.1
> > -
> > 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 7c3238bf91a..471f1500daa 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 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00
> > 2001
> > +From d3ef01a4208a801acad380a4aaceb6a21f8fa603 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 bf49770..7c5a363 100644
> > +index bcf77b9..6a4b472 100644
> > --- a/mesonbuild/modules/gnome.py
> > +++ b/mesonbuild/modules/gnome.py
> > -@@ -972,6 +972,10 @@ This will become a hard error in the
> > future.''')
> > - '--mode=' + mode]
> > +@@ -974,6 +974,10 @@ This will become a hard error in the
> > future.''')
> > + args.append('--{}={}'.format(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/0002-Support-building-
> > allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
> > Support-building-allarch-recipes-again.patch
> > index 8ad86a46e99..b8837d77b64 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,4 +1,4 @@
> > -From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00
> > 2001
> > +From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 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
> > @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <
> > peter.kjellerstedt@axis.com>
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > -index 86b350b..aa426ca 100644
> > +index 17de654..2d2deef 100644
> > --- a/mesonbuild/envconfig.py
> > +++ b/mesonbuild/envconfig.py
> > @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> > diff --git a/meta/recipes-devtools/meson/meson/0003-
> > native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-
> > native_bindir.patch
> > index 57de598d2f1..76cc4931d63 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 ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00
> > 2001
> > +From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 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
> > @@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <
> > ricardo.ribalda@gmail.com>
> > 2 files changed, 14 insertions(+), 11 deletions(-)
> >
> > diff --git a/mesonbuild/dependencies/base.py
> > b/mesonbuild/dependencies/base.py
> > -index 21da8e2..7d1ef85 100644
> > +index 3c55a56..eb52fd1 100644
> > --- a/mesonbuild/dependencies/base.py
> > +++ b/mesonbuild/dependencies/base.py
> > -@@ -155,7 +155,7 @@ class Dependency:
> > +@@ -185,7 +185,7 @@ class Dependency:
> > def get_exe_args(self, compiler):
> > return []
> >
> > @@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
> > raise DependencyException('{!r} is not a pkgconfig
> > dependency'.format(self.name))
> >
> > def get_configtool_variable(self, variable_name):
> > -@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
> > +@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
> > self.sources = sources
> > self.ext_deps = ext_deps
> >
> > @@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
> > raise DependencyException('Method
> > "get_pkgconfig_variable()" is '
> > 'invalid for an internal
> > dependency')
> >
> > -@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
> > +@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> > return s.format(self.__class__.__name__, self.name,
> > self.is_found,
> > self.version_reqs)
> >
> > @@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
> > # Always copy the environment since we're going to modify
> > it
> > # with pkg-config variables
> > if env is None:
> > -@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
> > +@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> > targs = tuple(args)
> > cache = PkgConfigDependency.pkgbin_cache
> > if (self.pkgbin, targs, fenv) not in cache:
> > @@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
> > return cache[(self.pkgbin, targs, fenv)]
> >
> > def _convert_mingw_paths(self, args):
> > -@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
> > - (self.name, out_raw))
> > - self.link_args, self.raw_link_args = self._search_libs(out,
> > out_raw)
> > +@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
> > + mlog.warning('Could not determine complete list of
> > dependencies for %s' % self.name)
> > + self.link_args, self.raw_link_args = self._search_libs(out,
> > out_raw, out_all)
> >
> > - def get_pkgconfig_variable(self, variable_name, kwargs):
> > + def get_pkgconfig_variable(self, variable_name, kwargs,
> > use_native=False):
> > options = ['--variable=' + variable_name, self.name]
> >
> > if 'define_variable' in kwargs:
> > -@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
> > +@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
> >
> > options = ['--define-variable=' + '='.join(definition)]
> > + options
> >
> > diff --git a/meta/recipes-devtools/meson/meson/vala-cross-
> > compile.patch b/meta/recipes-devtools/meson/meson/vala-cross-
> > compile.patch
> > deleted file mode 100644
> > index 816f810c054..00000000000
> > --- a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
> > +++ /dev/null
> > @@ -1,50 +0,0 @@
> > -From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00
> > 2001
> > -From: James Westman <flyingpimonster@flyingpimonster.net>
> > -Date: Mon, 24 Jun 2019 12:04:12 -0500
> > -Subject: [PATCH] Fix two errors when cross-compiling with Vala
> > -
> > -- AttributeError: 'ValaCompiler' object has no attribute
> > 'get_program_dirs'
> > -
> > - Fixed by adding a `get_program_dirs()` function to the base
> > Compiler
> > - class, to match `get_library_dirs()`
> > -
> > -- KeyError: 'vala_COMPILER'
> > -
> > - Fixed by creating the Vala compile rules for all machines, not
> > just
> > - the build machine.
> > -
> > -Upstream-Status: Backport [
> > https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d
> > ]
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ----
> > - mesonbuild/backend/ninjabackend.py | 3 +--
> > - mesonbuild/compilers/compilers.py | 3 +++
> > - 2 files changed, 4 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/mesonbuild/backend/ninjabackend.py
> > b/mesonbuild/backend/ninjabackend.py
> > -index a454e6ab5f..b830e377e4 100644
> > ---- a/mesonbuild/backend/ninjabackend.py
> > -+++ b/mesonbuild/backend/ninjabackend.py
> > -@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname,
> > compiler):
> > - self.generate_cs_compile_rule(compiler)
> > - return
> > - if langname == 'vala':
> > -- if
> > self.environment.machines.matches_build_machine(compiler.for_machine)
> > :
> > -- self.generate_vala_compile_rules(compiler)
> > -+ self.generate_vala_compile_rules(compiler)
> > - return
> > - if langname == 'rust':
> > - self.generate_rust_compile_rules(compiler)
> > -diff --git a/mesonbuild/compilers/compilers.py
> > b/mesonbuild/compilers/compilers.py
> > -index 5855de71c8..86c1e33407 100644
> > ---- a/mesonbuild/compilers/compilers.py
> > -+++ b/mesonbuild/compilers/compilers.py
> > -@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
> > - def get_library_dirs(self, *args, **kwargs):
> > - return ()
> > -
> > -+ def get_program_dirs(self, *args, **kwargs):
> > -+ return ()
> > -+
> > - def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
> > - raise EnvironmentException(
> > - 'Language {} does not support
> > has_multi_arguments.'.format(
> > diff --git a/meta/recipes-devtools/meson/meson_0.51.2.bb
> > b/meta/recipes-devtools/meson/meson_0.52.0.bb
> > similarity index 97%
> > rename from meta/recipes-devtools/meson/meson_0.51.2.bb
> > rename to meta/recipes-devtools/meson/meson_0.52.0.bb
> > index de9b905c12b..897fa148d94 100644
> > --- a/meta/recipes-devtools/meson/meson_0.51.2.bb
> > +++ b/meta/recipes-devtools/meson/meson_0.52.0.bb
> > @@ -1,4 +1,3 @@
> > include meson.inc
> >
> > BBCLASSEXTEND = "native"
> > -
> > diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> > b/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> > rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> > --
> > 2.17.1
> >
>
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-17 13:15 ` Khem Raj
@ 2019-10-17 23:31 ` Andreas Müller
2019-10-18 18:49 ` Alexander Kanavin
1 sibling, 0 replies; 40+ messages in thread
From: Andreas Müller @ 2019-10-17 23:31 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Thu, Oct 17, 2019 at 3:15 PM Khem Raj <raj.khem@gmail.com> wrote:
> > meson 0.52.x seems to be exposing the dconf build issue.
> >
> > https://errors.yoctoproject.org/Errors/Details/273492/
> >
> > also reported here
> > https://gitlab.gnome.org/GNOME/dconf/issues/59
> >
>
>
> Regardless of this report, this is now merged and I don't see any
> resolution either of a followup
> from the submitter or any other developer. This is quite disheartening
> since it takes a lot of effort to find
> these issues and reports. we should try to be considerate of the
> layers who are trying to keep up with
> OE-Core, like this we won't be able to improve the quality of these
> layers. I understand that there are no breakages seen in OE-cor but we
> should encourage more
> of other layers to test master and especially if there are reports
> than it would be good to heed to them.
>
https://github.com/mesonbuild/meson/pull/6030 looks seems to address.
Cannot test currently - am in 48h build from scratch currently (with
this patch reverted)
Andreas
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-17 13:15 ` Khem Raj
2019-10-17 23:31 ` Andreas Müller
@ 2019-10-18 18:49 ` Alexander Kanavin
2019-10-18 21:26 ` richard.purdie
2019-10-18 22:01 ` Andreas Müller
1 sibling, 2 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-18 18:49 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 20573 bytes --]
I certainly don't mean to ignore those reports, it's just that due to my
ongoing health problems, and having to dedicate most of my energy to the
day job (https://mbition.io/en/home/), I am not currently able to work on
the upstream issues in a timely manner the way I used to when maintaining
core was actually my day job (at Intel).
The question of how much effort people who update things in core should
allocate to fixing 'other' layers has been a conflict point for a long
time. I'd prefer to see more aggressive blacklisting/removal of recipes
that no one has an interest in fixing and updating.
Alex
On Thu, 17 Oct 2019 at 15:15, Khem Raj <raj.khem@gmail.com> wrote:
> On Sat, Oct 12, 2019 at 5:20 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Fri, 2019-10-11 at 13:47 +0200, Alexander Kanavin wrote:
> > > Drop backported patches.
> > >
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > > meta/recipes-devtools/meson/meson.inc | 7 +--
> > > ...efined-by-the-existance-of-a-cross-f.patch | 28 -----------
> > > .../0001-Make-CPU-family-warnings-fatal.patch | 8 +--
> > > ...etect-windows-also-if-the-system-str.patch | 29 -----------
> > > ...sues-that-arise-when-cross-compiling.patch | 8 +--
> > > ...pport-building-allarch-recipes-again.patch | 4 +-
> > > .../meson/meson/0003-native_bindir.patch | 20 ++++----
> > > .../meson/meson/vala-cross-compile.patch | 50 ---------------
> >
> > meson 0.52.x seems to be exposing the dconf build issue.
> >
> > https://errors.yoctoproject.org/Errors/Details/273492/
> >
> > also reported here
> > https://gitlab.gnome.org/GNOME/dconf/issues/59
> >
>
>
> Regardless of this report, this is now merged and I don't see any
> resolution either of a followup
> from the submitter or any other developer. This is quite disheartening
> since it takes a lot of effort to find
> these issues and reports. we should try to be considerate of the
> layers who are trying to keep up with
> OE-Core, like this we won't be able to improve the quality of these
> layers. I understand that there are no breakages seen in OE-cor but we
> should encourage more
> of other layers to test master and especially if there are reports
> than it would be good to heed to them.
>
>
> > > ----
> > > .../{meson_0.51.2.bb => meson_0.52.0.bb} | 1 -
> > > ...on_0.51.2.bb => nativesdk-meson_0.52.0.bb} | 0
> > > 10 files changed, 22 insertions(+), 133 deletions(-)
> > > delete mode 100644 meta/recipes-devtools/meson/meson/0001-Cross-
> > > build-is-defined-by-the-existance-of-a-cross-f.patch
> > > delete mode 100644 meta/recipes-devtools/meson/meson/0001-
> > > environment.py-detect-windows-also-if-the-system-str.patch
> > > delete mode 100644 meta/recipes-devtools/meson/meson/vala-cross-
> > > compile.patch
> > > rename meta/recipes-devtools/meson/{meson_0.51.2.bb =>
> > > meson_0.52.0.bb} (97%)
> > > rename meta/recipes-devtools/meson/{nativesdk-meson_0.51.2.bb =>
> > > nativesdk-meson_0.52.0.bb} (100%)
> > >
> > > diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-
> > > devtools/meson/meson.inc
> > > index 8219d87c741..ae0091c051c 100644
> > > --- a/meta/recipes-devtools/meson/meson.inc
> > > +++ b/meta/recipes-devtools/meson/meson.inc
> > > @@ -14,14 +14,11 @@ SRC_URI = "
> > > https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> > > file://0001-python-module-do-not-manipulate-the-
> > > environment-when.patch \
> > > file://disable-rpath-handling.patch \
> > > file://cross-prop-default.patch \
> > > - file://0001-environment.py-detect-windows-also-if-the-
> > > system-str.patch \
> > > - file://0001-Cross-build-is-defined-by-the-existance-of-a-
> > > cross-f.patch \
> > > file://0001-mesonbuild-environment.py-check-environment-
> > > for-vari.patch \
> > > file://0001-modules-python.py-do-not-substitute-python-s-
> > > install.patch \
> > > - file://vala-cross-compile.patch \
> > > "
> > > -SRC_URI[sha256sum] =
> > > "23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76"
> > > -SRC_URI[md5sum] = "d46c4a8e3cfd27f90e2c6fe4a69e574b"
> > > +SRC_URI[sha256sum] =
> > > "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
> > > +SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
> > >
> > > SRC_URI_append_class-native = " \
> > > file://0001-Make-CPU-family-warnings-fatal.patch \
> > > diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-
> > > defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-
> > > devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-
> > > a-cross-f.patch
> > > deleted file mode 100644
> > > index a5dbb81b088..00000000000
> > > --- a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-
> > > by-the-existance-of-a-cross-f.patch
> > > +++ /dev/null
> > > @@ -1,28 +0,0 @@
> > > -Upstream-Status: Backport
> > > -Signed-off-by: Ross Burton <ross.burton@intel.com>
> > > -
> > > -From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00
> > > 2001
> > > -From: Jussi Pakkanen <jpakkane@gmail.com>
> > > -Date: Sun, 6 Oct 2019 15:17:32 +0300
> > > -Subject: [PATCH] Cross build is defined by the existance of a cross
> > > file.
> > > -
> > > ----
> > > - mesonbuild/environment.py | 2 +-
> > > - 2 files changed, 2 insertions(+), 2 deletions(-)
> > > -
> > > -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > > -index e5d041b4..03c65688 100644
> > > ---- a/mesonbuild/environment.py
> > > -+++ b/mesonbuild/environment.py
> > > -@@ -611,7 +611,7 @@ class Environment:
> > > - self.first_invocation = True
> > > -
> > > - def is_cross_build(self) -> bool:
> > > -- return not
> > > self.machines.matches_build_machine(MachineChoice.HOST)
> > > -+ return self.coredata.is_cross_build()
> > > -
> > > - def dump_coredata(self):
> > > - return coredata.save(self.coredata, self.get_build_dir())
> > > ---
> > > -2.20.1
> > > -
> > > 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 444fc081686..fc55dcacf6d 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,4 +1,4 @@
> > > -From f70fee13e4dbc757cd8153cd42d92fa9394fb542 Mon Sep 17 00:00:00
> > > 2001
> > > +From c07d29b715209cd5d75b142a00a540d45b00c36d 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
> > > @@ -12,7 +12,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
> > > 2 files changed, 2 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > > -index 03c6346..86b350b 100644
> > > +index a59cd89..17de654 100644
> > > --- a/mesonbuild/envconfig.py
> > > +++ b/mesonbuild/envconfig.py
> > > @@ -186,7 +186,7 @@ class MachineInfo:
> > > @@ -25,10 +25,10 @@ index 03c6346..86b350b 100644
> > > endian = literal['endian']
> > > if endian not in ('little', 'big'):
> > > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > > -index 0cfdf9c..40aa189 100644
> > > +index 3704921..f1988f2 100644
> > > --- a/mesonbuild/environment.py
> > > +++ b/mesonbuild/environment.py
> > > -@@ -262,9 +262,7 @@ def detect_cpu_family(compilers: CompilersDict)
> > > -> str:
> > > +@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict)
> > > -> str:
> > > trial = 'parisc'
> > >
> > > if trial not in known_cpu_families:
> > > diff --git a/meta/recipes-devtools/meson/meson/0001-environment.py-
> > > detect-windows-also-if-the-system-str.patch b/meta/recipes-
> > > devtools/meson/meson/0001-environment.py-detect-windows-also-if-the-
> > > system-str.patch
> > > deleted file mode 100644
> > > index 2faeda2e711..00000000000
> > > --- a/meta/recipes-devtools/meson/meson/0001-environment.py-detect-
> > > windows-also-if-the-system-str.patch
> > > +++ /dev/null
> > > @@ -1,29 +0,0 @@
> > > -From b52e47c9d61dc4c930cfc7236fbeb70338c3b953 Mon Sep 17 00:00:00
> > > 2001
> > > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > > -Date: Mon, 25 Mar 2019 17:17:06 +0100
> > > -Subject: [PATCH] environment.py: detect windows also if the system
> > > string
> > > - contains 'mingw'
> > > -
> > > -Upstream-Status: Backport [fe645a0a9e2da230d2c500af1f5b2db5da1e364d]
> > > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > -
> > > ----
> > > - mesonbuild/envconfig.py | 2 +-
> > > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > > -
> > > -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > > -index 03c6346..a59cd89 100644
> > > ---- a/mesonbuild/envconfig.py
> > > -+++ b/mesonbuild/envconfig.py
> > > -@@ -198,7 +198,7 @@ class MachineInfo:
> > > - """
> > > - Machine is windows?
> > > - """
> > > -- return self.system in {'windows', 'mingw'}
> > > -+ return self.system == 'windows' or 'mingw' in self.system
> > > -
> > > - def is_cygwin(self) -> bool:
> > > - """
> > > ---
> > > -2.17.1
> > > -
> > > 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 7c3238bf91a..471f1500daa 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 1afbf5ccff56e582229c8f673f50aedf2b24117e Mon Sep 17 00:00:00
> > > 2001
> > > +From d3ef01a4208a801acad380a4aaceb6a21f8fa603 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 bf49770..7c5a363 100644
> > > +index bcf77b9..6a4b472 100644
> > > --- a/mesonbuild/modules/gnome.py
> > > +++ b/mesonbuild/modules/gnome.py
> > > -@@ -972,6 +972,10 @@ This will become a hard error in the
> > > future.''')
> > > - '--mode=' + mode]
> > > +@@ -974,6 +974,10 @@ This will become a hard error in the
> > > future.''')
> > > + args.append('--{}={}'.format(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/0002-Support-building-
> > > allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-
> > > Support-building-allarch-recipes-again.patch
> > > index 8ad86a46e99..b8837d77b64 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,4 +1,4 @@
> > > -From 3009a1c2f1b736b836a057d84dc11f379cba99cf Mon Sep 17 00:00:00
> > > 2001
> > > +From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 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
> > > @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <
> > > peter.kjellerstedt@axis.com>
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > > -index 86b350b..aa426ca 100644
> > > +index 17de654..2d2deef 100644
> > > --- a/mesonbuild/envconfig.py
> > > +++ b/mesonbuild/envconfig.py
> > > @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> > > diff --git a/meta/recipes-devtools/meson/meson/0003-
> > > native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-
> > > native_bindir.patch
> > > index 57de598d2f1..76cc4931d63 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 ac38495de38a1ea42e2bc09a2f23c2e945fbc22d Mon Sep 17 00:00:00
> > > 2001
> > > +From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 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
> > > @@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <
> > > ricardo.ribalda@gmail.com>
> > > 2 files changed, 14 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/mesonbuild/dependencies/base.py
> > > b/mesonbuild/dependencies/base.py
> > > -index 21da8e2..7d1ef85 100644
> > > +index 3c55a56..eb52fd1 100644
> > > --- a/mesonbuild/dependencies/base.py
> > > +++ b/mesonbuild/dependencies/base.py
> > > -@@ -155,7 +155,7 @@ class Dependency:
> > > +@@ -185,7 +185,7 @@ class Dependency:
> > > def get_exe_args(self, compiler):
> > > return []
> > >
> > > @@ -34,7 +34,7 @@ index 21da8e2..7d1ef85 100644
> > > raise DependencyException('{!r} is not a pkgconfig
> > > dependency'.format(self.name))
> > >
> > > def get_configtool_variable(self, variable_name):
> > > -@@ -214,7 +214,7 @@ class InternalDependency(Dependency):
> > > +@@ -248,7 +248,7 @@ class InternalDependency(Dependency):
> > > self.sources = sources
> > > self.ext_deps = ext_deps
> > >
> > > @@ -43,7 +43,7 @@ index 21da8e2..7d1ef85 100644
> > > raise DependencyException('Method
> > > "get_pkgconfig_variable()" is '
> > > 'invalid for an internal
> > > dependency')
> > >
> > > -@@ -639,15 +639,18 @@ class PkgConfigDependency(ExternalDependency):
> > > +@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> > > return s.format(self.__class__.__name__, self.name,
> > > self.is_found,
> > > self.version_reqs)
> > >
> > > @@ -65,7 +65,7 @@ index 21da8e2..7d1ef85 100644
> > > # Always copy the environment since we're going to modify
> > > it
> > > # with pkg-config variables
> > > if env is None:
> > > -@@ -663,7 +666,7 @@ class PkgConfigDependency(ExternalDependency):
> > > +@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> > > targs = tuple(args)
> > > cache = PkgConfigDependency.pkgbin_cache
> > > if (self.pkgbin, targs, fenv) not in cache:
> > > @@ -74,16 +74,16 @@ index 21da8e2..7d1ef85 100644
> > > return cache[(self.pkgbin, targs, fenv)]
> > >
> > > def _convert_mingw_paths(self, args):
> > > -@@ -845,7 +848,7 @@ class PkgConfigDependency(ExternalDependency):
> > > - (self.name, out_raw))
> > > - self.link_args, self.raw_link_args = self._search_libs(out,
> > > out_raw)
> > > +@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency):
> > > + mlog.warning('Could not determine complete list of
> > > dependencies for %s' % self.name)
> > > + self.link_args, self.raw_link_args = self._search_libs(out,
> > > out_raw, out_all)
> > >
> > > - def get_pkgconfig_variable(self, variable_name, kwargs):
> > > + def get_pkgconfig_variable(self, variable_name, kwargs,
> > > use_native=False):
> > > options = ['--variable=' + variable_name, self.name]
> > >
> > > if 'define_variable' in kwargs:
> > > -@@ -858,7 +861,7 @@ class PkgConfigDependency(ExternalDependency):
> > > +@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency):
> > >
> > > options = ['--define-variable=' + '='.join(definition)]
> > > + options
> > >
> > > diff --git a/meta/recipes-devtools/meson/meson/vala-cross-
> > > compile.patch b/meta/recipes-devtools/meson/meson/vala-cross-
> > > compile.patch
> > > deleted file mode 100644
> > > index 816f810c054..00000000000
> > > --- a/meta/recipes-devtools/meson/meson/vala-cross-compile.patch
> > > +++ /dev/null
> > > @@ -1,50 +0,0 @@
> > > -From 77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d Mon Sep 17 00:00:00
> > > 2001
> > > -From: James Westman <flyingpimonster@flyingpimonster.net>
> > > -Date: Mon, 24 Jun 2019 12:04:12 -0500
> > > -Subject: [PATCH] Fix two errors when cross-compiling with Vala
> > > -
> > > -- AttributeError: 'ValaCompiler' object has no attribute
> > > 'get_program_dirs'
> > > -
> > > - Fixed by adding a `get_program_dirs()` function to the base
> > > Compiler
> > > - class, to match `get_library_dirs()`
> > > -
> > > -- KeyError: 'vala_COMPILER'
> > > -
> > > - Fixed by creating the Vala compile rules for all machines, not
> > > just
> > > - the build machine.
> > > -
> > > -Upstream-Status: Backport [
> > >
> https://github.com/mesonbuild/meson/commit/77c3e6a4aaed07e626f4bf4deb7eb66e0f03a33d
> > > ]
> > > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ----
> > > - mesonbuild/backend/ninjabackend.py | 3 +--
> > > - mesonbuild/compilers/compilers.py | 3 +++
> > > - 2 files changed, 4 insertions(+), 2 deletions(-)
> > > -
> > > -diff --git a/mesonbuild/backend/ninjabackend.py
> > > b/mesonbuild/backend/ninjabackend.py
> > > -index a454e6ab5f..b830e377e4 100644
> > > ---- a/mesonbuild/backend/ninjabackend.py
> > > -+++ b/mesonbuild/backend/ninjabackend.py
> > > -@@ -1653,8 +1653,7 @@ def generate_compile_rule_for(self, langname,
> > > compiler):
> > > - self.generate_cs_compile_rule(compiler)
> > > - return
> > > - if langname == 'vala':
> > > -- if
> > > self.environment.machines.matches_build_machine(compiler.for_machine)
> > > :
> > > -- self.generate_vala_compile_rules(compiler)
> > > -+ self.generate_vala_compile_rules(compiler)
> > > - return
> > > - if langname == 'rust':
> > > - self.generate_rust_compile_rules(compiler)
> > > -diff --git a/mesonbuild/compilers/compilers.py
> > > b/mesonbuild/compilers/compilers.py
> > > -index 5855de71c8..86c1e33407 100644
> > > ---- a/mesonbuild/compilers/compilers.py
> > > -+++ b/mesonbuild/compilers/compilers.py
> > > -@@ -1117,6 +1117,9 @@ def find_library(self, *args, **kwargs):
> > > - def get_library_dirs(self, *args, **kwargs):
> > > - return ()
> > > -
> > > -+ def get_program_dirs(self, *args, **kwargs):
> > > -+ return ()
> > > -+
> > > - def has_multi_arguments(self, args, env) -> Tuple[bool, bool]:
> > > - raise EnvironmentException(
> > > - 'Language {} does not support
> > > has_multi_arguments.'.format(
> > > diff --git a/meta/recipes-devtools/meson/meson_0.51.2.bb
> > > b/meta/recipes-devtools/meson/meson_0.52.0.bb
> > > similarity index 97%
> > > rename from meta/recipes-devtools/meson/meson_0.51.2.bb
> > > rename to meta/recipes-devtools/meson/meson_0.52.0.bb
> > > index de9b905c12b..897fa148d94 100644
> > > --- a/meta/recipes-devtools/meson/meson_0.51.2.bb
> > > +++ b/meta/recipes-devtools/meson/meson_0.52.0.bb
> > > @@ -1,4 +1,3 @@
> > > include meson.inc
> > >
> > > BBCLASSEXTEND = "native"
> > > -
> > > diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> > > b/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> > > similarity index 100%
> > > rename from meta/recipes-devtools/meson/nativesdk-meson_0.51.2.bb
> > > rename to meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb
> > > --
> > > 2.17.1
> > >
> >
>
[-- Attachment #2: Type: text/html, Size: 28504 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-18 18:49 ` Alexander Kanavin
@ 2019-10-18 21:26 ` richard.purdie
2019-10-20 1:21 ` Khem Raj
2019-10-18 22:01 ` Andreas Müller
1 sibling, 1 reply; 40+ messages in thread
From: richard.purdie @ 2019-10-18 21:26 UTC (permalink / raw)
To: Alexander Kanavin, Khem Raj
Cc: Patches and discussions about the oe-core layer
On Fri, 2019-10-18 at 20:49 +0200, Alexander Kanavin wrote:
> I certainly don't mean to ignore those reports, it's just that due to
> my ongoing health problems, and having to dedicate most of my energy
> to the day job (https://mbition.io/en/home/), I am not currently able
> to work on the upstream issues in a timely manner the way I used to
> when maintaining core was actually my day job (at Intel).
>
> The question of how much effort people who update things in core
> should allocate to fixing 'other' layers has been a conflict point
> for a long time. I'd prefer to see more aggressive
> blacklisting/removal of recipes that no one has an interest in fixing
> and updating.
If anything this would be my fault for merging things despite there
being concerns raised. I have to admit I'd seen other patches and
therefore erroneously thought the issues we mostly resolved.
Should OE-Core block on all issues being resolved before merging? I'm
torn on that, I realise there are pros and cons.
It takes most of my time/energy to track the issues with core without
trying to remember that patch X breaks layer Y and that I need a report
back on that combination before I then find a patch and merge it.
So sorry, I probably shouldn't have taken this :/.
There is a fundamental issue with having enough people to help work on
these things though and requiring more work for changes to be merged
isn't going to help. I wish I knew what would help.
Cheers,
Richard
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-18 21:26 ` richard.purdie
@ 2019-10-20 1:21 ` Khem Raj
2019-10-20 9:50 ` richard.purdie
2019-10-20 12:32 ` richard.purdie
0 siblings, 2 replies; 40+ messages in thread
From: Khem Raj @ 2019-10-20 1:21 UTC (permalink / raw)
To: richard.purdie; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2268 bytes --]
On Sat, Oct 19, 2019 at 2:56 AM <richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2019-10-18 at 20:49 +0200, Alexander Kanavin wrote:
> > I certainly don't mean to ignore those reports, it's just that due to
> > my ongoing health problems, and having to dedicate most of my energy
> > to the day job (https://mbition.io/en/home/), I am not currently able
> > to work on the upstream issues in a timely manner the way I used to
> > when maintaining core was actually my day job (at Intel).
> >
> > The question of how much effort people who update things in core
> > should allocate to fixing 'other' layers has been a conflict point
> > for a long time. I'd prefer to see more aggressive
> > blacklisting/removal of recipes that no one has an interest in fixing
> > and updating.
>
> If anything this would be my fault for merging things despite there
> being concerns raised. I have to admit I'd seen other patches and
> therefore erroneously thought the issues we mostly resolved.
>
> Should OE-Core block on all issues being resolved before merging? I'm
> torn on that, I realise there are pros and cons.
If an issue is there and gets reported after it’s merged I think it’s fine
to do whatever is needed after the fact however if testing master-next from
oe-core and reported against it I think this will help you in longer run if
these master-next issues are looked into and blocked on. We should not run
Oe-core so fast that other layers fall way back behind where they start
supporting just releases and you have lost free integration testing that
other layers would offer
If there are too many reports then it would be questionable to block on it
but I don’t think that’s the case
>
> It takes most of my time/energy to track the issues with core without
> trying to remember that patch X breaks layer Y and that I need a report
> back on that combination before I then find a patch and merge it.
>
> So sorry, I probably shouldn't have taken this :/.
>
> There is a fundamental issue with having enough people to help work on
> these things though and requiring more work for changes to be merged
> isn't going to help. I wish I knew what would help.
>
> Cheers,
>
> Richard
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 3018 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-20 1:21 ` Khem Raj
@ 2019-10-20 9:50 ` richard.purdie
2019-10-20 12:32 ` richard.purdie
1 sibling, 0 replies; 40+ messages in thread
From: richard.purdie @ 2019-10-20 9:50 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Sun, 2019-10-20 at 06:51 +0530, Khem Raj wrote:
>
>
> On Sat, Oct 19, 2019 at 2:56 AM <richard.purdie@linuxfoundation.org>
> wrote:
> > On Fri, 2019-10-18 at 20:49 +0200, Alexander Kanavin wrote:
> > > I certainly don't mean to ignore those reports, it's just that
> > due to
> > > my ongoing health problems, and having to dedicate most of my
> > energy
> > > to the day job (https://mbition.io/en/home/), I am not currently
> > able
> > > to work on the upstream issues in a timely manner the way I used
> > to
> > > when maintaining core was actually my day job (at Intel).
> > >
> > > The question of how much effort people who update things in core
> > > should allocate to fixing 'other' layers has been a conflict
> > point
> > > for a long time. I'd prefer to see more aggressive
> > > blacklisting/removal of recipes that no one has an interest in
> > fixing
> > > and updating.
> >
> > If anything this would be my fault for merging things despite there
> > being concerns raised. I have to admit I'd seen other patches and
> > therefore erroneously thought the issues we mostly resolved.
> >
> > Should OE-Core block on all issues being resolved before merging?
> > I'm torn on that, I realise there are pros and cons.
>
> If an issue is there and gets reported after it’s merged I think it’s
> fine to do whatever is needed after the fact however if testing
> master-next from oe-core and reported against it I think this will
> help you in longer run if these master-next issues are looked into
> and blocked on. We should not run Oe-core so fast that other layers
> fall way back behind where they start supporting just releases and
> you have lost free integration testing that other layers would offer
>
> If there are too many reports then it would be questionable to block
> on it but I don’t think that’s the case
As I said, I understand the desire and from some perspectives it makes
a lot of sense. From a human resource perspective I have concerns.
Following this through:
This means we should make meta-oe testing a default part of full
builds, maybe even quick?
We're then effectively highlighting any issues and blocking patches on
testing with meta-oe. We should then really update the maintainer
guidelines to highlight they should be testing with meta-oe as well?
world builds of it?
Should we include other layers too? We're actually at the point where
project members want their layers tested so they get to know ASAP about
failures.
We (as in the TSC) did discuss this and basically said that a heads up
warning of problems was what we could realistically achieve, not
blocking. meta-oe is special in some ways, is it that special?
I suspect a more realistic take away is we figure out what set of tests
are missing for oe-core and add them, such that changes don't break
layers. In this case we're clearly missing some meson usecase tests?
Cheers,
Richard
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-20 1:21 ` Khem Raj
2019-10-20 9:50 ` richard.purdie
@ 2019-10-20 12:32 ` richard.purdie
2019-10-20 15:08 ` Andreas Müller
1 sibling, 1 reply; 40+ messages in thread
From: richard.purdie @ 2019-10-20 12:32 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2309 bytes --]
On Sun, 2019-10-20 at 06:51 +0530, Khem Raj wrote:
>
>
> On Sat, Oct 19, 2019 at 2:56 AM <richard.purdie@linuxfoundation.org>
> wrote:
> > On Fri, 2019-10-18 at 20:49 +0200, Alexander Kanavin wrote:
> > > I certainly don't mean to ignore those reports, it's just that
> > due to
> > > my ongoing health problems, and having to dedicate most of my
> > energy
> > > to the day job (https://mbition.io/en/home/), I am not currently
> > able
> > > to work on the upstream issues in a timely manner the way I used
> > to
> > > when maintaining core was actually my day job (at Intel).
> > >
> > > The question of how much effort people who update things in core
> > > should allocate to fixing 'other' layers has been a conflict
> > point
> > > for a long time. I'd prefer to see more aggressive
> > > blacklisting/removal of recipes that no one has an interest in
> > fixing
> > > and updating.
> >
> > If anything this would be my fault for merging things despite there
> > being concerns raised. I have to admit I'd seen other patches and
> > therefore erroneously thought the issues we mostly resolved.
> >
> > Should OE-Core block on all issues being resolved before merging?
> > I'm
> > torn on that, I realise there are pros and cons.
>
> If an issue is there and gets reported after it’s merged I think it’s
> fine to do whatever is needed after the fact however if testing
> master-next from oe-core and reported against it I think this will
> help you in longer run if these master-next issues are looked into
> and blocked on. We should not run Oe-core so fast that other layers
> fall way back behind where they start supporting just releases and
> you have lost free integration testing that other layers would offer
>
> If there are too many reports then it would be questionable to block
> on it but I don’t think that’s the case
Feeling suitably responsible for this breakage, I looked into it. The
following two patches, one for meson in OE-Core and the other for dconf
in meta-oe seem to address the problem. I'm not entirely sure they're
correct but they don't actually change the library binary so its
probably fine whilst upstream sorts it out.
If they look ok to you I'll submit them "properly".
Cheers,
Richard
[-- Attachment #2: 0001-dconf-Fix-build-with-meson-0.52.patch --]
[-- Type: text/x-patch, Size: 2294 bytes --]
From 7ebd50f90b3b7f4e1dc56f07ae7e8e02275d41c8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 20 Oct 2019 13:27:07 +0100
Subject: [PATCH] dconf: Fix build with meson 0.52
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../dconf/dconf/fix-meson-0.52.patch | 25 +++++++++++++++++++
.../recipes-gnome/dconf/dconf_0.32.0.bb | 1 +
2 files changed, 26 insertions(+)
create mode 100644 meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
diff --git a/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch b/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
new file mode 100644
index 000000000..bca021347
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch
@@ -0,0 +1,25 @@
+With meson 0.52 the build fails due to duplicate symbols. There is a fix
+to meson but the dconf build also needs tweaking.
+
+https://gitlab.gnome.org/GNOME/dconf/issues/59
+https://github.com/mesonbuild/meson/pull/5936
+
+Despite the comments there about this being incorrect, libdconf is unchanged
+between 0.51 and 0.52 and this patch.
+
+Upstream-Status: Pending [under discussion, see above links]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: dconf-0.32.0/client/meson.build
+===================================================================
+--- dconf-0.32.0.orig/client/meson.build
++++ dconf-0.32.0/client/meson.build
+@@ -28,7 +28,7 @@ libdconf_client = static_library(
+
+ libdconf_client_dep = declare_dependency(
+ dependencies: gio_dep,
+- link_whole: libdconf_client,
++ link_with: libdconf_client,
+ )
+
+ libdconf = shared_library(
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
index 8d1bbdfd1..fec04079e 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb
@@ -3,6 +3,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SECTION = "x11/gnome"
+SRC_URI += "file://fix-meson-0.52.patch"
SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a"
SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab"
--
2.17.1
[-- Attachment #3: 0001-meson-Backport-fix-to-assist-meta-oe-breakage.patch --]
[-- Type: text/x-patch, Size: 5577 bytes --]
From f52194e9806002e66235f63184a2eea0b15c19a1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 20 Oct 2019 13:12:32 +0100
Subject: [PATCH] meson: Backport fix to assist meta-oe breakage
Add a backported commit from upstream which helps fix build failures
in meta-oe.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/meson/meson.inc | 1 +
...e971bd320f3df15c1ee74f54858e6792b183.patch | 95 +++++++++++++++++++
2 files changed, 96 insertions(+)
create mode 100644 meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index ae0091c051c..84bcc8409de 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,6 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://cross-prop-default.patch \
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
+ file://dbc9e971bd320f3df15c1ee74f54858e6792b183.patch \
"
SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"
SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991"
diff --git a/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch b/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
new file mode 100644
index 00000000000..7ea8a133e6a
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch
@@ -0,0 +1,95 @@
+From dbc9e971bd320f3df15c1ee74f54858e6792b183 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Fri, 11 Oct 2019 11:01:22 -0400
+Subject: [PATCH] Remove duplicated object files in static libraries
+
+When a static library link_whole to a bunch of other static libraries,
+we have to extract all their objects recursively. But that could
+introduce duplicated objects. ar is dumb enough to allow this without
+error, but once the resulting static library is linked into an
+executable or shared library, the linker will complain about duplicated
+symbols.
+
+Upstream-Status: Backport
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+---
+ mesonbuild/backend/backends.py | 3 ++-
+ test cases/unit/69 static link/lib/func17.c | 4 ++++
+ test cases/unit/69 static link/lib/func18.c | 6 ++++++
+ test cases/unit/69 static link/lib/func19.c | 7 +++++++
+ test cases/unit/69 static link/lib/meson.build | 12 ++++++++++++
+ 5 files changed, 31 insertions(+), 1 deletion(-)
+ create mode 100644 test cases/unit/69 static link/lib/func17.c
+ create mode 100644 test cases/unit/69 static link/lib/func18.c
+ create mode 100644 test cases/unit/69 static link/lib/func19.c
+
+diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
+index 947be1cbef..e54809657f 100644
+--- a/mesonbuild/backend/backends.py
++++ b/mesonbuild/backend/backends.py
+@@ -281,7 +281,8 @@ def relpath(self, todir, fromdir):
+ os.path.join('dummyprefixdir', fromdir))
+
+ def flatten_object_list(self, target, proj_dir_to_build_root=''):
+- return self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root)
++ obj_list = self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root)
++ return list(dict.fromkeys(obj_list))
+
+ def _flatten_object_list(self, target, objects, proj_dir_to_build_root):
+ obj_list = []
+diff --git a/test cases/unit/69 static link/lib/func17.c b/test cases/unit/69 static link/lib/func17.c
+new file mode 100644
+index 0000000000..d1d8ec498c
+--- /dev/null
++++ b/test cases/unit/69 static link/lib/func17.c
+@@ -0,0 +1,4 @@
++int func17()
++{
++ return 1;
++}
+diff --git a/test cases/unit/69 static link/lib/func18.c b/test cases/unit/69 static link/lib/func18.c
+new file mode 100644
+index 0000000000..c149085ba4
+--- /dev/null
++++ b/test cases/unit/69 static link/lib/func18.c
+@@ -0,0 +1,6 @@
++int func17();
++
++int func18()
++{
++ return func17() + 1;
++}
+diff --git a/test cases/unit/69 static link/lib/func19.c b/test cases/unit/69 static link/lib/func19.c
+new file mode 100644
+index 0000000000..69120e4bf8
+--- /dev/null
++++ b/test cases/unit/69 static link/lib/func19.c
+@@ -0,0 +1,7 @@
++int func17();
++int func18();
++
++int func19()
++{
++ return func17() + func18();
++}
+diff --git a/test cases/unit/69 static link/lib/meson.build b/test cases/unit/69 static link/lib/meson.build
+index 5f04aab6a1..8f95fc4546 100644
+--- a/test cases/unit/69 static link/lib/meson.build
++++ b/test cases/unit/69 static link/lib/meson.build
+@@ -66,3 +66,15 @@ libfunc15 = static_library('func15', 'func15.c',
+ libfunc16 = static_library('func16', 'func16.c',
+ link_with : libfunc15,
+ install : true)
++
++# Verify func17.c.o gets included only once into libfunc19, otherwise
++# func19-shared would failed with duplicated symbol.
++libfunc17 = static_library('func17', 'func17.c',
++ install : false)
++libfunc18 = static_library('func18', 'func18.c',
++ link_with : libfunc17,
++ install : false)
++libfunc19 = static_library('func19', 'func19.c',
++ link_whole : [libfunc17, libfunc18],
++ install : false)
++shared_library('func19-shared', link_whole : [libfunc19])
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-20 12:32 ` richard.purdie
@ 2019-10-20 15:08 ` Andreas Müller
2019-10-20 15:53 ` Andreas Müller
0 siblings, 1 reply; 40+ messages in thread
From: Andreas Müller @ 2019-10-20 15:08 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Sun, Oct 20, 2019 at 2:32 PM <richard.purdie@linuxfoundation.org> wrote:
>
> Feeling suitably responsible for this breakage, I looked into it. The
> following two patches, one for meson in OE-Core and the other for dconf
> in meta-oe seem to address the problem. I'm not entirely sure they're
> correct but they don't actually change the library binary so its
> probably fine whilst upstream sorts it out.
>
> If they look ok to you I'll submit them "properly".
>
> Cheers,
>
> Richard
>
Had exactly the same idea for dconf: in the discussion they did
link_whole->link_with for libdconf_common which is wrong and was just
meant as example.
As soon as I finished bisecting do_rootfs issue (reported) I will try
* dconf-patch
* dconf+meson patch
and report.
Thanks for taking care
Andreas
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-20 15:08 ` Andreas Müller
@ 2019-10-20 15:53 ` Andreas Müller
2019-10-22 7:30 ` Andreas Müller
0 siblings, 1 reply; 40+ messages in thread
From: Andreas Müller @ 2019-10-20 15:53 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Sun, Oct 20, 2019 at 5:08 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Sun, Oct 20, 2019 at 2:32 PM <richard.purdie@linuxfoundation.org> wrote:
> >
> > Feeling suitably responsible for this breakage, I looked into it. The
> > following two patches, one for meson in OE-Core and the other for dconf
> > in meta-oe seem to address the problem. I'm not entirely sure they're
> > correct but they don't actually change the library binary so its
> > probably fine whilst upstream sorts it out.
> >
> > If they look ok to you I'll submit them "properly".
> >
> > Cheers,
> >
> > Richard
> >
> Had exactly the same idea for dconf: in the discussion they did
> link_whole->link_with for libdconf_common which is wrong and was just
> meant as example.
>
> As soon as I finished bisecting do_rootfs issue (reported) I will try
>
> * dconf-patch
> * dconf+meson patch
>
> and report.
>
> Thanks for taking care
>
Had to adjust the dconf-patch:
* Here (and in master-next) we moved dconf 0.32 -> 0.34
* The SRC_URI has to go below inherit gnomebase otherwise it does not
cause effect.
But very important result: dconf-patch only fixes dconf build!
Will send out reworked version to meta-oe list
Andreas
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-20 15:53 ` Andreas Müller
@ 2019-10-22 7:30 ` Andreas Müller
0 siblings, 0 replies; 40+ messages in thread
From: Andreas Müller @ 2019-10-22 7:30 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Sun, Oct 20, 2019 at 5:53 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > As soon as I finished bisecting do_rootfs issue (reported) I will try
> >
> > * dconf-patch
> > * dconf+meson patch
> >
> > and report.
> >
> > Thanks for taking care
> >
> Had to adjust the dconf-patch:
>
> * Here (and in master-next) we moved dconf 0.32 -> 0.34
> * The SRC_URI has to go below inherit gnomebase otherwise it does not
> cause effect.
>
> But very important result: dconf-patch only fixes dconf build!
>
> Will send out reworked version to meta-oe list
>
15K build tasks later:
Have build my images with both patches (meson/dconf): No fallout but
more interesting: The do_rootfs [1] issue is gone and the meson patch
was the only change I applied. Have no idea how meson affects qemu
(did not build from scratch and qemu-native was rebuild due to
dependencies). Whatever: Have a full build again \o/
[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-October/288091.html
Andreas
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-18 18:49 ` Alexander Kanavin
2019-10-18 21:26 ` richard.purdie
@ 2019-10-18 22:01 ` Andreas Müller
2019-10-18 22:19 ` Richard Purdie
1 sibling, 1 reply; 40+ messages in thread
From: Andreas Müller @ 2019-10-18 22:01 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Fri, Oct 18, 2019 at 8:50 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> I certainly don't mean to ignore those reports, it's just that due to my ongoing health problems, and having to dedicate most of my energy to the day job (https://mbition.io/en/home/), I am not currently able to work on the upstream issues in a timely manner the way I used to when maintaining core was actually my day job (at Intel).
>
> The question of how much effort people who update things in core should allocate to fixing 'other' layers has been a conflict point for a long time. I'd prefer to see more aggressive blacklisting/removal of recipes that no one has an interest in fixing and updating.
>
> Alex
>
First and most important: Wish you the very best to get back full health
Second: If I read meson github issues correctly, there are chances
that meson 0.52.1 fixes (works around) static library fallout as seen
on dconf
Third: Taking this in was sub-optimal but: We are close to release
which is btw the most smooth I've ever seen since I follow this
project.
We're back to dirty master where sh*t happens...
Andreas
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/19] meson: update to 0.52.0
2019-10-18 22:01 ` Andreas Müller
@ 2019-10-18 22:19 ` Richard Purdie
0 siblings, 0 replies; 40+ messages in thread
From: Richard Purdie @ 2019-10-18 22:19 UTC (permalink / raw)
To: Andreas Müller, Alexander Kanavin
Cc: Patches and discussions about the oe-core layer
On Sat, 2019-10-19 at 00:01 +0200, Andreas Müller wrote:
> On Fri, Oct 18, 2019 at 8:50 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> > I certainly don't mean to ignore those reports, it's just that due
> > to my ongoing health problems, and having to dedicate most of my
> > energy to the day job (https://mbition.io/en/home/), I am not
> > currently able to work on the upstream issues in a timely manner
> > the way I used to when maintaining core was actually my day job (at
> > Intel).
> >
> > The question of how much effort people who update things in core
> > should allocate to fixing 'other' layers has been a conflict point
> > for a long time. I'd prefer to see more aggressive
> > blacklisting/removal of recipes that no one has an interest in
> > fixing and updating.
> >
> > Alex
> >
> First and most important: Wish you the very best to get back full
> health
> Second: If I read meson github issues correctly, there are chances
> that meson 0.52.1 fixes (works around) static library fallout as seen
> on dconf
> Third: Taking this in was sub-optimal but: We are close to release
> which is btw the most smooth I've ever seen since I follow this
> project.
>
> We're back to dirty master where sh*t happens...
Just to be clear for those not following close, this is only on master
and not on the release branch which did not get this change.
Cheers,
Richard
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 17/19] libmodulemd-v1: introduce the recipe
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (14 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 16/19] meson: update to 0.52.0 Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 18/19] libmodulemd: remove " Alexander Kanavin
2019-10-11 11:47 ` [PATCH 19/19] createrepo-c: upgrade to 0.15.1 Alexander Kanavin
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Upstream has split version 1 of the libmodulemd recipe into
its own branch and removed version 1 from the master
branch and 2.x releases; as libdnf requires v1 of libmodulemd,
this commit introduces a v1-specific revipe.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/maintainers.inc | 1 +
meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 2 +-
...t-generate-gtkdoc-or-python-bindings.patch | 60 +++++++++++++++++++
...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 +++++++
.../libmodulemd/libmodulemd-v1_git.bb | 26 ++++++++
5 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
create mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index ab0c6c55412..7a9d55c5c34 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -356,6 +356,7 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
+RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>"
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
index 4ff294c32cb..3f11e0231fa 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
@@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
S = "${WORKDIR}/git"
-DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native"
+DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native"
inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
new file mode 100644
index 00000000000..d950ad5867e
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
@@ -0,0 +1,60 @@
+From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 6 Sep 2019 17:07:00 +0200
+Subject: [PATCH] Do not generate gtkdoc or python bindings
+
+All of these really need a configuration option.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ meson.build | 12 ------------
+ modulemd/meson.build | 8 --------
+ 2 files changed, 20 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 155c9e7..fe35d5e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -51,25 +51,13 @@ gnome = import('gnome')
+ pkg = import('pkgconfig')
+ gobject = dependency('gobject-2.0')
+ yaml = dependency('yaml-0.1')
+-gtkdoc = dependency('gtk-doc')
+
+ glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+
+ sh = find_program('sh')
+ sed = find_program('sed')
+ test = find_program('test')
+
+-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
+-if ret.returncode() != 0
+- error('Missing documentation for GLib.')
+-endif
+-
+-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
+-if ret.returncode() != 0
+- error('Missing documentation for GObject.')
+-endif
+-
+ python_name = get_option('python_name')
+
+ if python_name != ''
+diff --git a/modulemd/meson.build b/modulemd/meson.build
+index 9a164b5..349c982 100644
+--- a/modulemd/meson.build
++++ b/modulemd/meson.build
+@@ -523,11 +523,3 @@ configure_file(
+ configuration : xcdata
+ )
+
+-gnome.gtkdoc(
+- 'modulemd-1.0',
+- install_dir: 'modulemd-1.0',
+- src_dir : './modulemd',
+- main_xml : 'modulemd-docs.xml',
+- install : true,
+-)
+-
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
new file mode 100644
index 00000000000..847b5f700b0
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
@@ -0,0 +1,22 @@
+From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 6 Nov 2018 13:41:29 +0100
+Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+---
+ spec_tmpl.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec_tmpl.sh b/spec_tmpl.sh
+index 0238087..126853c 100755
+--- a/spec_tmpl.sh
++++ b/spec_tmpl.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+
+ version=$1
+ template=$2
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
new file mode 100644
index 00000000000..9790470f4fe
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
@@ -0,0 +1,26 @@
+SUMMARY = "C Library for manipulating module metadata files"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
+
+SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
+ file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
+ file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
+ "
+
+PV = "1.8.15"
+SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
+UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
+
+S = "${WORKDIR}/git"
+
+inherit meson gobject-introspection
+
+EXTRA_OEMESON = "-Ddeveloper_build=false"
+
+DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
+
+BBCLASSEXTEND = "native nativesdk"
+
+GIR_MESON_OPTION = 'skip_introspection'
+GIR_MESON_ENABLE_FLAG = 'false'
+GIR_MESON_DISABLE_FLAG = 'true'
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 18/19] libmodulemd: remove the recipe
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (15 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 17/19] libmodulemd-v1: introduce the recipe Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
2019-10-11 11:47 ` [PATCH 19/19] createrepo-c: upgrade to 0.15.1 Alexander Kanavin
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Version 2 of the recipe is not actually required by anything; the
lidmodulemd dependency in createrepo-c is optional, and the
libmodulemd feature is not used in YP.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/maintainers.inc | 1 -
.../createrepo-c/createrepo-c_0.15.0.bb | 4 +-
...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 ------
...xplicitly-specify-the-v1-library-in-.patch | 28 --------
...n.build-do-not-generate-gir-or-gtkdo.patch | 71 -------------------
.../libmodulemd/libmodulemd_git.bb | 26 -------
6 files changed, 2 insertions(+), 150 deletions(-)
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 7a9d55c5c34..d85e5b697f5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -355,7 +355,6 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
-RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>"
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
index ae0a35da847..dc1b851b2d7 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
@@ -12,12 +12,12 @@ SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
S = "${WORKDIR}/git"
-DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd"
+DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
DEPENDS_append_class-native = " file-replacement-native"
inherit cmake pkgconfig bash-completion distutils3-base
-EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF"
+EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
deleted file mode 100644
index 2598c177c4c..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 6 Nov 2018 13:41:29 +0100
-Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- spec_tmpl.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec_tmpl.sh b/spec_tmpl.sh
-index 14e895a..fc80fc6 100755
---- a/spec_tmpl.sh
-+++ b/spec_tmpl.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
-
- version=$1
- libmodulemd_v1_version=$2
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
deleted file mode 100644
index 1568d25f9d8..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 21 May 2019 17:59:26 +0200
-Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
- pkgconfig
-
-Otherwise there would be '-lmodulemd' which resolves
-to v2 version if both v2 and v1 are present in the sysroot.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- modulemd/v1/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index 4d54e69..9144ca2 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -325,7 +325,7 @@ configure_file(
- )
-
- pkg.generate(
-- libraries : modulemd_v1_lib,
-+ libraries : '-l:libmodulemd.so.1',
- subdirs : v1_header_path,
- version : libmodulemd_v1_version,
- name : 'modulemd',
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
deleted file mode 100644
index 0b7535624c9..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 6 Nov 2018 13:43:00 +0100
-Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
- bindings
-
-All of these really need a configuration option.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- meson.build | 3 +--
- modulemd/v1/meson.build | 8 --------
- modulemd/v2/meson.build | 12 ------------
- 3 files changed, 1 insertion(+), 22 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 5a0cd3d..f51b16e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -52,7 +52,6 @@ gnome = import('gnome')
- pkg = import('pkgconfig')
- gobject = dependency('gobject-2.0')
- yaml = dependency('yaml-0.1')
--gtkdoc = dependency('gtk-doc')
-
- sh = find_program('sh')
- sed = find_program('sed')
-@@ -127,4 +126,4 @@ configure_file(
- )
-
- subdir('modulemd')
--subdir('bindings/python')
-+
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index ddc95a1..e85fafd 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -356,11 +356,3 @@ configure_file(
- configuration : xcdata
- )
-
--gnome.gtkdoc(
-- 'modulemd-1.0',
-- install_dir: 'modulemd-1.0',
-- src_dir : './modulemd/v1',
-- main_xml : 'modulemd-v1-docs.xml',
-- install : true,
--)
--
-diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
-index 93c7fbd..0d9ed24 100644
---- a/modulemd/v2/meson.build
-+++ b/modulemd/v2/meson.build
-@@ -285,15 +285,3 @@ configure_file(
- configuration : xcdata
- )
-
--gnome.gtkdoc(
-- 'modulemd-2.0',
-- install_dir: 'modulemd-2.0',
-- src_dir : './modulemd/v2',
-- main_xml : 'modulemd-v2-docs.xml',
-- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'),
-- dependencies : [
-- modulemd_v2_dep,
-- ],
-- install : true,
--)
--
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
deleted file mode 100644
index 63d3fad6ab4..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "C Library for manipulating module metadata files"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
-
-SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
- file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
- file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
- file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
- "
-
-PV = "2.6.0"
-SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
-
-S = "${WORKDIR}/git"
-
-inherit meson gobject-introspection
-
-EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true"
-
-DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
-
-BBCLASSEXTEND = "native nativesdk"
-
-GIR_MESON_OPTION = 'skip_introspection'
-GIR_MESON_ENABLE_FLAG = 'false'
-GIR_MESON_DISABLE_FLAG = 'true'
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH 19/19] createrepo-c: upgrade to 0.15.1
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
` (16 preceding siblings ...)
2019-10-11 11:47 ` [PATCH 18/19] libmodulemd: remove " Alexander Kanavin
@ 2019-10-11 11:47 ` Alexander Kanavin
17 siblings, 0 replies; 40+ messages in thread
From: Alexander Kanavin @ 2019-10-11 11:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{createrepo-c_0.15.0.bb => createrepo-c_0.15.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.15.0.bb => createrepo-c_0.15.1.bb} (95%)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
similarity index 95%
rename from meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
rename to meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
index dc1b851b2d7..797db738f47 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
"
-SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
+SRCREV = "bc67f19ed09593e3886ebeee2391e9d51cc3439f"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 40+ messages in thread