summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 21:23:27 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 13:42:08 (GMT)
commit61228679ec30fcac20237f69a3a117231dea0f73 (patch)
tree0857c2425950597abb52822f5796558100cc59e2
parent3c3ff0fe40b8ee47457634c7cc26aa2d2e1cea79 (diff)
downloadpoky-61228679ec30fcac20237f69a3a117231dea0f73.tar.gz
meson: update 0.54.3 -> 0.55.0
Rebase patches. (From OE-Core rev: 09dd785ead455fa677c5ccf336d49a32dd7ab6d1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/meson/meson.inc2
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch19
-rw-r--r--meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch48
-rw-r--r--meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch11
-rw-r--r--meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch4
-rw-r--r--meta/recipes-devtools/meson/meson/disable-rpath-handling.patch10
-rw-r--r--meta/recipes-devtools/meson/meson_0.55.0.bb (renamed from meta/recipes-devtools/meson/meson_0.54.3.bb)0
-rw-r--r--meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb (renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb)0
8 files changed, 47 insertions, 47 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index ffa17b3..607093a 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 16 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ 17 file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
18 " 18 "
19SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662" 19SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
20 20
21SRC_URI_append_class-native = " \ 21SRC_URI_append_class-native = " \
22 file://0001-Make-CPU-family-warnings-fatal.patch \ 22 file://0001-Make-CPU-family-warnings-fatal.patch \
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 1be94a9..ceb2fde 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,7 +1,7 @@
1From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001 1From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH 1/2] Make CPU family warnings fatal
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Ross Burton <ross.burton@intel.com> 7Signed-off-by: Ross Burton <ross.burton@intel.com>
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 2 files changed, 2 insertions(+), 4 deletions(-) 12 2 files changed, 2 insertions(+), 4 deletions(-)
13 13
14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
15index 17058df..18bbf86 100644 15index 219b62e..d1be65b 100644
16--- a/mesonbuild/envconfig.py 16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py 17+++ b/mesonbuild/envconfig.py
18@@ -225,7 +225,7 @@ class MachineInfo: 18@@ -199,7 +199,7 @@ class MachineInfo:
19 19
20 cpu_family = literal['cpu_family'] 20 cpu_family = literal['cpu_family']
21 if cpu_family not in known_cpu_families: 21 if cpu_family not in known_cpu_families:
22- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family) 22- mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
23+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family) 23+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
24 24
25 endian = literal['endian'] 25 endian = literal['endian']
26 if endian not in ('little', 'big'): 26 if endian not in ('little', 'big'):
27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
28index a2f78a4..59fcb07 100644 28index bf09a88..8eabe78 100644
29--- a/mesonbuild/environment.py 29--- a/mesonbuild/environment.py
30+++ b/mesonbuild/environment.py 30+++ b/mesonbuild/environment.py
31@@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: 31@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
32 trial = 'parisc' 32 trial = 'parisc'
33 33
34 if trial not in known_cpu_families: 34 if trial not in known_cpu_families:
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644
39 39
40 return trial 40 return trial
41 41
42--
432.24.0
44
diff --git a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
index 35c18f0..a1f8422 100644
--- a/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
+++ b/meta/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch
@@ -1,4 +1,4 @@
1From 7be634fa9705d0367f48a91305f9acb642ff0a11 Mon Sep 17 00:00:00 2001 1From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 27 May 2020 16:43:05 +0000 3Date: Wed, 27 May 2020 16:43:05 +0000
4Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR 4Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
@@ -9,33 +9,29 @@ determine when a custom variable is a path)
9 9
10Upstream-Status: Pending 10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 mesonbuild/modules/gnome.py | 8 ++++---- 14 mesonbuild/modules/gnome.py | 4 ++--
14 1 file changed, 4 insertions(+), 4 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
15 16
16diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py 17diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
17index 89d5d5d..d75f2e5 100644 18index 52016f4..2b72ee4 100644
18--- a/mesonbuild/modules/gnome.py 19--- a/mesonbuild/modules/gnome.py
19+++ b/mesonbuild/modules/gnome.py 20+++ b/mesonbuild/modules/gnome.py
20@@ -739,17 +739,17 @@ class GnomeModule(ExtensionModule): 21@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
21 if giscanner.found(): 22 if giscanner is not None:
22 giscanner_path = giscanner.get_command()[0] 23 self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
23 if not any(x in giscanner_path for x in gi_util_dirs_check): 24 elif self.gir_dep.type_name == 'pkgconfig':
24- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) 25- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
25+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) 26+ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
26 else: 27 else:
27- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) 28 self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
28+ giscanner = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) 29 gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
29 30 if gicompiler is not None:
30 gicompiler = self.interpreter.find_program_impl('g-ir-compiler') 31 self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
31 if gicompiler.found(): 32 elif self.gir_dep.type_name == 'pkgconfig':
32 gicompiler_path = gicompiler.get_command()[0] 33- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
33 if not any(x in gicompiler_path for x in gi_util_dirs_check): 34+ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
34- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) 35 else:
35+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) 36 self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
36 else: 37 return self.gir_dep, self.giscanner, self.gicompiler
37- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
38+ gicompiler = os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {})
39
40 ns = kwargs.pop('namespace')
41 nsversion = kwargs.pop('nsversion')
diff --git a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
index a25c392..c0ad01e 100644
--- a/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
+++ b/meta/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch
@@ -1,4 +1,4 @@
1From 1d178fb2928d325e339b15972890ceced863d3ec Mon Sep 17 00:00:00 2001 1From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 18 Apr 2019 17:36:11 +0200 3Date: Thu, 18 Apr 2019 17:36:11 +0200
4Subject: [PATCH] modules/python.py: do not substitute python's install prefix 4Subject: [PATCH] modules/python.py: do not substitute python's install prefix
@@ -10,15 +10,16 @@ b) shouldn't be necessary as Python's prefix ought to be correct in the first pl
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
13--- 14---
14 mesonbuild/modules/python.py | 7 +++---- 15 mesonbuild/modules/python.py | 7 +++----
15 1 file changed, 3 insertions(+), 4 deletions(-) 16 1 file changed, 3 insertions(+), 4 deletions(-)
16 17
17diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py 18diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
18index 6e2c63b..f5a37ac 100644 19index 2f0c644..d2aa565 100644
19--- a/mesonbuild/modules/python.py 20--- a/mesonbuild/modules/python.py
20+++ b/mesonbuild/modules/python.py 21+++ b/mesonbuild/modules/python.py
21@@ -254,7 +254,7 @@ import sysconfig 22@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
22 import json 23 import json
23 import sys 24 import sys
24 25
@@ -27,8 +28,8 @@ index 6e2c63b..f5a37ac 100644
27 28
28 def links_against_libpython(): 29 def links_against_libpython():
29 from distutils.core import Distribution, Extension 30 from distutils.core import Distribution, Extension
30@@ -279,12 +279,11 @@ class PythonInstallation(ExternalProgramHolder): 31@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
31 ExternalProgramHolder.__init__(self, python) 32 ExternalProgramHolder.__init__(self, python, interpreter.subproject)
32 self.interpreter = interpreter 33 self.interpreter = interpreter
33 self.subproject = self.interpreter.subproject 34 self.subproject = self.interpreter.subproject
34- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix') 35- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
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 b5b463e..7a3b012 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 @@
1From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001 1From 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Thu, 26 Jul 2018 16:32:49 +0200 3Date: Thu, 26 Jul 2018 16:32:49 +0200
4Subject: [PATCH] Support building allarch recipes again 4Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py 15diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
16index 18bbf86..e76315e 100644 16index dc20616..f54adcd 100644
17--- a/mesonbuild/envconfig.py 17--- a/mesonbuild/envconfig.py
18+++ b/mesonbuild/envconfig.py 18+++ b/mesonbuild/envconfig.py
19@@ -36,6 +36,7 @@ _T = T.TypeVar('_T') 19@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
diff --git a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
index 38e50d7..4653a72 100644
--- a/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
+++ b/meta/recipes-devtools/meson/meson/disable-rpath-handling.patch
@@ -1,4 +1,4 @@
1From 3af10fa8cd4e97181288d72227dea712290fd5e6 Mon Sep 17 00:00:00 2001 1From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 23 Nov 2018 15:28:28 +0000 3Date: Fri, 23 Nov 2018 15:28:28 +0000
4Subject: [PATCH] meson: Disable rpath stripping at install time 4Subject: [PATCH] meson: Disable rpath stripping at install time
@@ -16,17 +16,17 @@ Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
16 1 file changed, 5 insertions(+), 2 deletions(-) 16 1 file changed, 5 insertions(+), 2 deletions(-)
17 17
18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py 18diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
19index ace0569..85bd8df 100644 19index 0be01fe..5406cab 100644
20--- a/mesonbuild/minstall.py 20--- a/mesonbuild/minstall.py
21+++ b/mesonbuild/minstall.py 21+++ b/mesonbuild/minstall.py
22@@ -508,8 +508,11 @@ class Installer: 22@@ -512,8 +512,11 @@ class Installer:
23 if file_copied: 23 if file_copied:
24 self.did_install_something = True 24 self.did_install_something = True
25 try: 25 try:
26- depfixer.fix_rpath(outname, install_rpath, final_path, 26- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
27- install_name_mappings, verbose=False) 27- install_name_mappings, verbose=False)
28+ if install_rpath: 28+ if install_rpath:
29+ depfixer.fix_rpath(outname, install_rpath, final_path, 29+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
30+ install_name_mappings, verbose=False) 30+ install_name_mappings, verbose=False)
31+ else: 31+ else:
32+ print("RPATH changes at install time disabled") 32+ print("RPATH changes at install time disabled")
diff --git a/meta/recipes-devtools/meson/meson_0.54.3.bb b/meta/recipes-devtools/meson/meson_0.55.0.bb
index de9b905..de9b905 100644
--- a/meta/recipes-devtools/meson/meson_0.54.3.bb
+++ b/meta/recipes-devtools/meson/meson_0.55.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb
index 67add2c..67add2c 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb