| Message ID | 20230509172344.1516743-11-alex@linutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/27] insane.bbclass: add a SUMMARY/HOMEPAGE check (oe-core recipes only) | expand |
On 5/9/23 10:23 AM, Alexander Kanavin wrote: > Rebase two patches. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...for-clang-before-guessing-gcc-or-lcc.patch | 14 +++--- > ...-not-manipulate-the-environment-when.patch | 48 +++++++++---------- > .../meson/{meson_1.0.1.bb => meson_1.1.0.bb} | 2 +- > 3 files changed, 31 insertions(+), 33 deletions(-) > rename meta/recipes-devtools/meson/{meson_1.0.1.bb => meson_1.1.0.bb} (98%) > > diff --git a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch > index 58fa1194398..c449bf8cda4 100644 > --- a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch > +++ b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch > @@ -1,4 +1,4 @@ > -From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001 > +From e3d1297c408b9b4d5d6a962aad5501e869287c98 Mon Sep 17 00:00:00 2001 > From: Khem Raj <raj.khem@gmail.com> > Date: Thu, 31 Mar 2022 15:00:24 -0700 > Subject: [PATCH] Check for clang before guessing gcc or lcc > @@ -21,19 +21,20 @@ this check anyway. > > Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218] This is merged upstreamed with a slightly different fix see https://github.com/mesonbuild/meson/commit/24ea1d3f1968bff52ccaaf33fcdd59e810459aa9 If we have this fix already in 1.1.0 which seems to be the case. then the full patch here can be dropped. > Signed-off-by: Khem Raj <raj.khem@gmail.com> > + > --- > mesonbuild/compilers/detect.py | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py > -index 53948b01a..ba335cf39 100644 > +index 6eca155..2df241a 100644 > --- a/mesonbuild/compilers/detect.py > +++ b/mesonbuild/compilers/detect.py > -@@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin > +@@ -334,13 +334,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin > version = search_version(out) > > guess_gcc_or_lcc: T.Optional[str] = None > -- if 'Free Software Foundation' in out or 'xt-' in out: > +- if 'Free Software Foundation' in out or out.startswith('xt-'): > - guess_gcc_or_lcc = 'gcc' > - if 'e2k' in out and 'lcc' in out: > - guess_gcc_or_lcc = 'lcc' > @@ -41,7 +42,7 @@ index 53948b01a..ba335cf39 100644 > - # this output has "Free Software Foundation" in its version > - guess_gcc_or_lcc = None > + if not 'clang' in compiler_name: > -+ if 'Free Software Foundation' in out or 'xt-' in out: > ++ if 'Free Software Foundation' in out or out.startswith('xt-'): > + guess_gcc_or_lcc = 'gcc' > + if 'e2k' in out and 'lcc' in out: > + guess_gcc_or_lcc = 'lcc' > @@ -51,6 +52,3 @@ index 53948b01a..ba335cf39 100644 > > if guess_gcc_or_lcc: > defines = _get_gnu_compiler_defines(compiler) > --- > -2.35.1 > - > diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch > index f01a6678181..19502fa9cd8 100644 > --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch > +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch > @@ -1,4 +1,4 @@ > -From 2e9582167bf9d3273004edb2637310531f0155ab Mon Sep 17 00:00:00 2001 > +From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 19 Nov 2018 14:24:26 +0100 > Subject: [PATCH] python module: do not manipulate the environment when calling > @@ -8,30 +8,30 @@ Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > - mesonbuild/modules/python.py | 6 +----- > + mesonbuild/dependencies/python.py | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py > -index 3bbccd1..fda7a25 100644 > ---- a/mesonbuild/modules/python.py > -+++ b/mesonbuild/modules/python.py > -@@ -277,9 +277,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', > - # there is no LIBPC, so we can't search in it > - return NotFoundDependency('python', env) > +diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py > +index 14386f9..118a15f 100644 > +--- a/mesonbuild/dependencies/python.py > ++++ b/mesonbuild/dependencies/python.py > +@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', > + empty.name = 'python' > + return empty > > -- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) > -- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) > -- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir > - try: > - return PythonPkgConfigDependency(name, env, kwargs, installation, True) > - finally: > -@@ -288,8 +285,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', > - os.environ[name] = value > - elif name in os.environ: > - del os.environ[name] > -- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) > -- set_env('PKG_CONFIG_PATH', old_pkg_path) > -+ pass > +- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) > +- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) > +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir > + try: > + return PythonPkgConfigDependency(name, env, kwargs, installation, True) > + finally: > +@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', > + os.environ[name] = value > + elif name in os.environ: > + del os.environ[name] > +- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) > +- set_env('PKG_CONFIG_PATH', old_pkg_path) > ++ pass > > - candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) > - # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, > + candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) > + # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, > diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.1.0.bb > similarity index 98% > rename from meta/recipes-devtools/meson/meson_1.0.1.bb > rename to meta/recipes-devtools/meson/meson_1.1.0.bb > index fd478b21612..278f8e24c56 100644 > --- a/meta/recipes-devtools/meson/meson_1.0.1.bb > +++ b/meta/recipes-devtools/meson/meson_1.1.0.bb > @@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ > file://0002-Support-building-allarch-recipes-again.patch \ > file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ > " > -SRC_URI[sha256sum] = "d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1" > +SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" > > inherit python_setuptools_build_meta github-releases > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#181066): https://lists.openembedded.org/g/openembedded-core/message/181066 > Mute This Topic: https://lists.openembedded.org/mt/98788924/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, 10 May 2023 at 02:55, Khem Raj <raj.khem@gmail.com> wrote: > > Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218] > > This is merged upstreamed with a slightly different fix see > https://github.com/mesonbuild/meson/commit/24ea1d3f1968bff52ccaaf33fcdd59e810459aa9 > > If we have this fix already in 1.1.0 which seems to be the case. then > the full patch here can be dropped. Thanks, I've queued a followup patch that does this. So that v2 or a respin of the whole patchset can be avoided. Alex
diff --git a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch index 58fa1194398..c449bf8cda4 100644 --- a/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch +++ b/meta/recipes-devtools/meson/meson/0001-Check-for-clang-before-guessing-gcc-or-lcc.patch @@ -1,4 +1,4 @@ -From 8739e1c3bef653415ad4b9b9c318ccfa76c43da6 Mon Sep 17 00:00:00 2001 +From e3d1297c408b9b4d5d6a962aad5501e869287c98 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Mar 2022 15:00:24 -0700 Subject: [PATCH] Check for clang before guessing gcc or lcc @@ -21,19 +21,20 @@ this check anyway. Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/10218] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- mesonbuild/compilers/detect.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py -index 53948b01a..ba335cf39 100644 +index 6eca155..2df241a 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py -@@ -427,13 +427,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin +@@ -334,13 +334,14 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin version = search_version(out) guess_gcc_or_lcc: T.Optional[str] = None -- if 'Free Software Foundation' in out or 'xt-' in out: +- if 'Free Software Foundation' in out or out.startswith('xt-'): - guess_gcc_or_lcc = 'gcc' - if 'e2k' in out and 'lcc' in out: - guess_gcc_or_lcc = 'lcc' @@ -41,7 +42,7 @@ index 53948b01a..ba335cf39 100644 - # this output has "Free Software Foundation" in its version - guess_gcc_or_lcc = None + if not 'clang' in compiler_name: -+ if 'Free Software Foundation' in out or 'xt-' in out: ++ if 'Free Software Foundation' in out or out.startswith('xt-'): + guess_gcc_or_lcc = 'gcc' + if 'e2k' in out and 'lcc' in out: + guess_gcc_or_lcc = 'lcc' @@ -51,6 +52,3 @@ index 53948b01a..ba335cf39 100644 if guess_gcc_or_lcc: defines = _get_gnu_compiler_defines(compiler) --- -2.35.1 - diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index f01a6678181..19502fa9cd8 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From 2e9582167bf9d3273004edb2637310531f0155ab Mon Sep 17 00:00:00 2001 +From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -8,30 +8,30 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - mesonbuild/modules/python.py | 6 +----- + mesonbuild/dependencies/python.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 3bbccd1..fda7a25 100644 ---- a/mesonbuild/modules/python.py -+++ b/mesonbuild/modules/python.py -@@ -277,9 +277,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', - # there is no LIBPC, so we can't search in it - return NotFoundDependency('python', env) +diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py +index 14386f9..118a15f 100644 +--- a/mesonbuild/dependencies/python.py ++++ b/mesonbuild/dependencies/python.py +@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', + empty.name = 'python' + return empty -- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) -- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) -- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir - try: - return PythonPkgConfigDependency(name, env, kwargs, installation, True) - finally: -@@ -288,8 +285,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', - os.environ[name] = value - elif name in os.environ: - del os.environ[name] -- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) -- set_env('PKG_CONFIG_PATH', old_pkg_path) -+ pass +- old_pkg_libdir = os.environ.pop('PKG_CONFIG_LIBDIR', None) +- old_pkg_path = os.environ.pop('PKG_CONFIG_PATH', None) +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir + try: + return PythonPkgConfigDependency(name, env, kwargs, installation, True) + finally: +@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', + os.environ[name] = value + elif name in os.environ: + del os.environ[name] +- set_env('PKG_CONFIG_LIBDIR', old_pkg_libdir) +- set_env('PKG_CONFIG_PATH', old_pkg_path) ++ pass - candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) - # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, + candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation)) + # We only need to check both, if a python install has a LIBPC. It might point to the wrong location, diff --git a/meta/recipes-devtools/meson/meson_1.0.1.bb b/meta/recipes-devtools/meson/meson_1.1.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.0.1.bb rename to meta/recipes-devtools/meson/meson_1.1.0.bb index fd478b21612..278f8e24c56 100644 --- a/meta/recipes-devtools/meson/meson_1.0.1.bb +++ b/meta/recipes-devtools/meson/meson_1.1.0.bb @@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0002-Support-building-allarch-recipes-again.patch \ file://0001-Check-for-clang-before-guessing-gcc-or-lcc.patch \ " -SRC_URI[sha256sum] = "d926b730de6f518728cc7c57bc5e701667bae0c3522f9e369427b2cc7839d3c1" +SRC_URI[sha256sum] = "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" inherit python_setuptools_build_meta github-releases
Rebase two patches. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...for-clang-before-guessing-gcc-or-lcc.patch | 14 +++--- ...-not-manipulate-the-environment-when.patch | 48 +++++++++---------- .../meson/{meson_1.0.1.bb => meson_1.1.0.bb} | 2 +- 3 files changed, 31 insertions(+), 33 deletions(-) rename meta/recipes-devtools/meson/{meson_1.0.1.bb => meson_1.1.0.bb} (98%)