package/meson: bump to version 0.55.0
PATCH 1/1 package/meson: bump to version 0.55.0
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
---
...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++--
...tic-libs-when-default-library-static.patch | 8 +-
...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 -------------------
...encies-base.py-add-pkg_config_stati.patch} | 8 +-
package/meson/meson.hash | 4 +-
package/meson/meson.mk | 2 +-
package/pkg-meson.mk | 12 +--
support/misc/utils.mk | 4 +
8 files changed, 29 insertions(+), 99 deletions(-)
delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch
rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +8 -8
@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty
@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, - install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")
@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1
package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4 -4
@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static
@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes
@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1
package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0 -74
74 lines not on this page · raw message
package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4 -4
@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static
@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']
@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1
package/meson/meson.hash +2 -2
@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
package/meson/meson.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING
package/pkg-meson.mk +6 -6
@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \
@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \
support/misc/utils.mk +4 -0
@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) +# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d" +make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep
Signature · 1 line
2.25.1
PATCH 1/1 package/meson: bump to version 0.55.0
Hello James,
Quoted 38 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 10 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +4
-4+++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
Quoted 219 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 5 lines
support/misc/utils.mk +2
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1)))) +# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"
Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'
Regards,
Peter
Quoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep
PATCH 1/1 package/meson: bump to version 0.55.0
Quoted 48 lines · Peter Seiderer
Hello James,
Quoted 43 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-5@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer:
Quoted 8 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 5 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-1+ if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103
Quoted 223 lines
Quoted 223 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1))))
Quoted 5 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 2 lines
support/misc/utils.mk +2
-0+# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'
Fixed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200716213139.3190401-1-james.hilliard1 at gmail.com/
Quoted 10 lines
Regards,
PeterQuoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 package/meson: bump to version 0.55.0
Re-add CC
Sorry for missing it on first send...
Quoted 313 lines · Peter Seiderer
Hello James,
Quoted 58 lines · James Hilliard
Quoted 48 lines · Peter Seiderer
Hello James,
Quoted 43 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-5@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer:Quoted 8 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 5 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-1+ if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
Quoted 3 lines
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Regards,
PeterQuoted 240 lines
Quoted 223 lines
Quoted 223 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1))))Quoted 5 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 2 lines
support/misc/utils.mk +2
-0+# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'Fixed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200716213139.3190401-1-james.hilliard1 at gmail.com/Quoted 10 lines
Regards,
PeterQuoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep
A message that is not in the archive (sent off-list or not yet received): CADvTj4pLKMnE7G4B3SzV0A=95b=fVgBNdoW7wZvRX50HPGO9GQ@mail.gmail.com
PATCH 1/1 package/meson: bump to version 0.55.0
Re-add CC
Quoted 317 lines · James Hilliard
Quoted 63 lines · Peter Seiderer
Hello James,
Quoted 58 lines · James Hilliard
Quoted 56 lines · Peter Seiderer
Hello James,
Quoted 38 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.pypackage/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 10 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +4
-4+++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
Quoted 6 lines
Quoted 3 lines
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Yeah, looks like it does, sent a v3 with that removed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200717080356.3094739-1-james.hilliard1 at gmail.com/Quoted 245 lines
Regards,
PeterQuoted 240 lines
Quoted 223 lines
Quoted 223 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1))))Quoted 5 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 2 lines
support/misc/utils.mk +2
-0+# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'Fixed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200716213139.3190401-1-james.hilliard1 at gmail.com/Quoted 10 lines
Regards,
PeterQuoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep
PATCH 1/1 package/meson: bump to version 0.55.0
Hello James,
Quoted 76 lines · Peter Seiderer
Re-add CC
Quoted 72 lines · James Hilliard
Quoted 63 lines · Peter Seiderer
Hello James,
Quoted 58 lines · James Hilliard
Quoted 56 lines · Peter Seiderer
Hello James,
Quoted 38 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.pypackage/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 10 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +4
-4+++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
Quoted 6 lines
Quoted 3 lines
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Yeah, looks like it does, sent a v3 with that removed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200717080356.3094739-1-james.hilliard1 at gmail.com/
Did you test it or did your decide by patch description/patch review (recall the failure condition was a bit tricky)?
The meson pull request 7103 mentions the meson issue 2567 ([1]), mentioned in the original version of the buildroot meson rpath patch ([2])...
Regards,
Peter
[1] https://github.com/mesonbuild/meson/issues/2567
[2] https://git.buildroot.net/buildroot/commit/?id=7a23af4773665d2ee40e2d4e525746ebe38456dd
Quoted 250 lines
Quoted 238 lines
Quoted 238 lines
Regards,
PeterQuoted 234 lines
Quoted 223 lines
Quoted 223 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1))))Quoted 5 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 2 lines
support/misc/utils.mk +2
-0+# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'Fixed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200716213139.3190401-1-james.hilliard1 at gmail.com/Quoted 4 lines
Regards,
PeterQuoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 97
Quoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 1/1 package/meson: bump to version 0.55.0
Quoted 77 lines · Peter Seiderer
Hello James,
Quoted 72 lines · Peter Seiderer
Re-add CC
Quoted 68 lines · James Hilliard
Quoted 67 lines · Peter Seiderer
Hello James,
Quoted 61 lines · James Hilliard
Quoted 48 lines · Peter Seiderer
Hello James,
Quoted 43 lines · James Hilliard
Drop g-ir-scanner/g-ir-compiler override patch which is now upstream.
Rebase remaining patches.
Meson now requires single quotes for cross-compilation.conf, replace double quotes with single quotes.
Signed-off-by James Hilliard <[email protected]>--- ...-RPATH-if-install_rpath-is-not-empty.patch | 16 ++-- ...tic-libs-when-default-library-static.patch | 8 +- ...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 ------------------- ...encies-base.py-add-pkg_config_stati.patch} | 8 +- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/pkg-meson.mk | 12 +-- support/misc/utils.mk | 4 + 8 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-5@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer:Quoted 8 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 5 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-1+ if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Yeah, looks like it does, sent a v3 with that removed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200717080356.3094739-1-james.hilliard1 at gmail.com/Did you test it or did your decide by patch description/patch review (recall the failure condition was a bit tricky)?
I did a build test and everything seemed to still compile ok.
Quoted 262 lines
The meson pull request 7103 mentions the meson issue 2567 ([1]), mentioned in the original version of the buildroot meson rpath patch ([2])...
Regards,
Peter[1] https://github.com/mesonbuild/meson/issues/2567
[2] https://git.buildroot.net/buildroot/commit/?id=7a23af4773665d2ee40e2d4e525746ebe38456ddQuoted 250 lines
Quoted 238 lines
Quoted 238 lines
Regards,
PeterQuoted 234 lines
Quoted 223 lines
Quoted 223 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case + if install_rpath: -+ depfixer.fix_rpath(outname, install_rpath, final_path, ++ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("Skipping RPATH fixing")@@ -32,5 +32,5 @@ index 8ac6aab1..7ef04116 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.20.1 +2.25.1package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch +4
-4@@ -1,4 +1,4 @@ -From b390f29b9e0170d5bf410f4bef5a697655857633 Mon Sep 17 00:00:00 2001 +From ea85465e608178080c3b4d51af9765a8c7c0dae3 Mon Sep 17 00:00:00 2001 From: Matt Weber <[email protected]> Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static@@ -27,10 +27,10 @@ Signed-off-by: Matthew Weber <[email protected]> 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index 5d50b7d..8f5f1c6 100644 +index 47e97d261..729c98acc 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -857,6 +857,9 @@ class CLikeCompiler: +@@ -940,6 +940,9 @@ class CLikeCompiler: elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes@@ -41,5 +41,5 @@ index 5d50b7d..8f5f1c6 100644 # Linux/BSDs shlibext = ['so'] -- -2.17.1 +2.25.1package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patch deleted +0
-74@@ -1,74 +0,0 @@ -From 49b1c8df7e4ff3a441d831f926d87920952025bf Mon Sep 17 00:00:00 2001 -From: James Hilliard <[email protected]> -Date: Sat, 2 May 2020 20:43:36 -0600 -Subject: [PATCH] Allow overriding g-ir-scanner and g-ir-compiler binaries. - -This is useful when one needs to force meson to use wrappers for cross -compilation. - -Signed-off-by: James Hilliard <[email protected]> -[james.hilliard1 at gmail.com: backport and largely adapt upstream commit -1e073c4c1bd7de06bc74d84e3807c9b210e57a22, as the version in master has -undergone haevy refactorisation] ---- - mesonbuild/modules/gnome.py | 34 +++++++++++++++++++++------------- - 1 file changed, 21 insertions(+), 13 deletions(-) - -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index a00005588..b6d7cc141 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -32,7 +32,7 @@ from ..mesonlib import ( - MachineChoice, MesonException, OrderedSet, Popen_safe, extract_as_list, - join_args, unholder, - ) --from ..dependencies import Dependency, PkgConfigDependency, InternalDependency -+from ..dependencies import Dependency, PkgConfigDependency, InternalDependency, ExternalProgram - from ..interpreterbase import noKwargs, permittedKwargs, FeatureNew, FeatureNewKwargs - - # gresource compilation is broken due to the way -@@ -735,21 +735,29 @@ class GnomeModule(ExtensionModule): - # these utilities via pkg-config, so it would be best to use the - # results from pkg-config when possible. - gi_util_dirs_check = [state.environment.get_build_dir(), state.environment.get_source_dir()] -- giscanner = self.interpreter.find_program_impl('g-ir-scanner') -- if giscanner.found(): -- giscanner_path = giscanner.get_command()[0] -- if not any(x in giscanner_path for x in gi_util_dirs_check): -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') -+ if giscanner_bin is not None: -+ giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner_bin) - else: -- giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ giscanner = self.interpreter.find_program_impl('g-ir-scanner') -+ if giscanner.found(): -+ giscanner_path = giscanner.get_command()[0] -+ if not any(x in giscanner_path for x in gi_util_dirs_check): -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) -+ else: -+ giscanner = self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}) - -- gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -- if gicompiler.found(): -- gicompiler_path = gicompiler.get_command()[0] -- if not any(x in gicompiler_path for x in gi_util_dirs_check): -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler_bin = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler') -+ if gicompiler_bin is not None: -+ gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler_bin) - else: -- gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ gicompiler = self.interpreter.find_program_impl('g-ir-compiler') -+ if gicompiler.found(): -+ gicompiler_path = gicompiler.get_command()[0] -+ if not any(x in gicompiler_path for x in gi_util_dirs_check): -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) -+ else: -+ gicompiler = self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}) - - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') --- -2.25.1 -package/meson/0003-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch renamed from package/meson/0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +4
-4@@ -1,4 +1,4 @@ -From 71295eec724f89ef5f5822c17cf44480335225cd Mon Sep 17 00:00:00 2001 +From 8622d37587169c1e4a4206a9462868ede057f0e8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static@@ -23,10 +23,10 @@ Signed-off-by: Romain Naour <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 5636602e..de4e87bc 100644 +index 23701da95..83e51626d 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -858,7 +858,8 @@ class PkgConfigDependency(ExternalDependency): +@@ -849,7 +849,8 @@ class PkgConfigDependency(ExternalDependency): def _set_libs(self): env = None libcmd = [self.name, '--libs']@@ -37,5 +37,5 @@ index 5636602e..de4e87bc 100644 # Force pkg-config to output -L fields even if they are system # paths so we can do manual searching with cc.find_library() later. -- -2.25.4 +2.25.1package/meson/meson.hash +2
-2@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.54.2/meson-0.54.2.tar.gz.asc -sha256 a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455 meson-0.54.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.55.0/meson-0.55.0.tar.gz.asc +sha256 0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 meson-0.55.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYINGpackage/meson/meson.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.54.2 +MESON_VERSION = 0.55.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYINGpackage/pkg-meson.mk +6
-6@@ -71,9 +71,9 @@ define $(2)_CONFIGURE_CMDS -e 's%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$$(call make-comma-list,$$($(2)_CFLAGS))%g' \ - -e 's%@TARGET_LDFLAGS@%$$(call make-comma-list,$$($(2)_LDFLAGS))%g' \ - -e 's%@TARGET_CXXFLAGS@%$$(call make-comma-list,$$($(2)_CXXFLAGS))%g' \ + -e 's%@TARGET_CFLAGS@%$$(call make-sq-comma-list,$$($(2)_CFLAGS))%g' \ + -e 's%@TARGET_LDFLAGS@%$$(call make-sq-comma-list,$$($(2)_LDFLAGS))%g' \ + -e 's%@TARGET_CXXFLAGS@%$$(call make-sq-comma-list,$$($(2)_CXXFLAGS))%g' \ -e 's%@HOST_DIR@%$$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \@@ -190,9 +190,9 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_ARCH@%$(HOST_MESON_TARGET_CPU_FAMILY)%g' \ -e 's%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g' \ -e 's%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g' \ - -e 's%@TARGET_CFLAGS@%$(call make-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ - -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ + -e 's%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ -e 's%@STATIC@%$$(if $$(BR2_STATIC_LIBS),true,false)%g' \support/misc/utils.mk +0
-0@@ -88,6 +88,10 @@ notfirstword = $(wordlist 2,$(words $(1)),$(1)) # list of unquoted items: a b c d --> "a", "b", "c", "d" make-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,"%",$(strip $(1))))Quoted 5 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 92
Quoted 2 lines
support/misc/utils.mk +2
-0+# build a comma-separated list of single quoted items, from a space-separated +# list of unquoted items: a b c d --> "a", "b", "c", "d"Should be:
# list of unquoted items: a b c d --> 'a', 'b', 'c', 'd'Fixed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200716213139.3190401-1-james.hilliard1 at gmail.com/Quoted 4 lines
Regards,
PeterQuoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
support/misc/utils.mk notfirstword = $(wordlist 2,$(words $(1)),$(1)) · line 97
Quoted 5 lines
support/misc/utils.mk +2
-0+make-sq-comma-list = $(subst $(space),$(comma)$(space),$(patsubst %,\'\'%\'',$(strip $(1)))) + # Needed for the foreach loops to loop over the list of hooks, so that # each hook call is properly separated by a newline. define sep_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 1/1 package/meson: bump to version 0.55.0
Hello James,
On Fri, 17 Jul 2020 16:24:41 -0600, James Hilliard <[email protected]> wrote:
[...]
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
Quoted 35 lines
Quoted 34 lines
Quoted 22 lines
Quoted 22 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-5@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer:Quoted 8 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 5 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +3
-1+ if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Yeah, looks like it does, sent a v3 with that removed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200717080356.3094739-1-james.hilliard1 at gmail.com/Did you test it or did your decide by patch description/patch review (recall the failure condition was a bit tricky)?
I did a build test and everything seemed to still compile ok.
Same simple check failed back once (see [3], [4], [5] for the history), at least a test with one (or more) host packages build by meson needed ;-)
$ git grep host-meson-package | cat docs/manual/adding-packages-meson.txt:packages is also available, with the +host-meson-package+ macro. package/gobject-introspection/gobject-introspection.mk:$(eval $(host-meson-package)) package/libglib2/libglib2.mk:$(eval $(host-meson-package)) package/orc/orc.mk:$(eval $(host-meson-package)) package/pango/pango.mk:$(eval $(host-meson-package)) package/pkg-meson.mk:host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) package/systemd/systemd.mk:$(eval $(host-meson-package)) package/wayland/wayland.mk:$(eval $(host-meson-package))
Regards,
Peter
[3] http://lists.busybox.net/pipermail/buildroot/2018-July/226154.html
[4] http://lists.busybox.net/pipermail/buildroot/2018-July/226314.html
[5] http://lists.busybox.net/pipermail/buildroot/2018-October/232956.html
Quoted 11 lines
Quoted 11 lines
The meson pull request 7103 mentions the meson issue 2567 ([1]), mentioned in the original version of the buildroot meson rpath patch ([2])...
Regards,
Peter[1] https://github.com/mesonbuild/meson/issues/2567
[2] https://git.buildroot.net/buildroot/commit/?id=7a23af4773665d2ee40e2d4e525746ebe38456dd
PATCH 1/1 package/meson: bump to version 0.55.0
Quoted 47 lines · Peter Seiderer
Hello James,
On Fri, 17 Jul 2020 16:24:41 -0600, James Hilliard <[email protected]> wrote:
[...]
Quoted 40 lines
Quoted 40 lines
Quoted 39 lines
Quoted 39 lines
Quoted 31 lines
Quoted 31 lines
Quoted 30 lines
Quoted 17 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +2
-2@@ -1,4 +1,4 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 +From bb155880bd08d7c0c9ddf0264d73016a426d8579 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan <[email protected]> Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty@@ -11,20 +11,20 @@ Signed-off-by: Peter Seiderer <[email protected]> 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 +index 0be01fe75..d991cf4e7 100644 --- a/mesonbuild/minstall.pypackage/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch Signed-off-by: Peter Seiderer <[email protected]> · line 21
Quoted 10 lines
package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +4
-4+++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): +@@ -512,8 +512,14 @@ class Installer: + if file_copied: + self.did_install_something = True try: -- depfixer.fix_rpath(outname, install_rpath, final_path, +- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,Out of interest, do you know with which commit the t.rpath_dirs_to_remove comes in (or what is the functionality of it)?
Quoted 6 lines
Quoted 3 lines
https://github.com/mesonbuild/meson/commit/d7235c5905fa98207d90f3ad34bf590493498d5b
https://github.com/mesonbuild/meson/pull/7103Thanks for the links, did only a very quick look at the discussion (mentioning buildroot), any chance the upstream commit makes this patch unnecessary?
Yeah, looks like it does, sent a v3 with that removed:
https://patchwork.ozlabs.org/project/buildroot/patch/20200717080356.3094739-1-james.hilliard1 at gmail.com/
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
Did you test it or did your decide by patch description/patch review (recall the failure condition was a bit tricky)?
I did a build test and everything seemed to still compile ok.
Same simple check failed back once (see [3], [4], [5] for the history), at least a test with one (or more) host packages build by meson needed ;-)
Looks good, I've verified all of those packages compile without errors.
Quoted 32 lines
$ git grep host-meson-package | cat docs/manual/adding-packages-meson.txt:packages is also available, with the +host-meson-package+ macro. package/gobject-introspection/gobject-introspection.mk:$(eval $(host-meson-package)) package/libglib2/libglib2.mk:$(eval $(host-meson-package)) package/orc/orc.mk:$(eval $(host-meson-package)) package/pango/pango.mk:$(eval $(host-meson-package)) package/pkg-meson.mk:host-meson-package = $(call inner-meson-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) package/systemd/systemd.mk:$(eval $(host-meson-package)) package/wayland/wayland.mk:$(eval $(host-meson-package))Regards,
Peter[3] http://lists.busybox.net/pipermail/buildroot/2018-July/226154.html
[4] http://lists.busybox.net/pipermail/buildroot/2018-July/226314.html
[5] http://lists.busybox.net/pipermail/buildroot/2018-October/232956.htmlQuoted 11 lines
Quoted 11 lines
The meson pull request 7103 mentions the meson issue 2567 ([1]), mentioned in the original version of the buildroot meson rpath patch ([2])...
Regards,
Peter[1] https://github.com/mesonbuild/meson/issues/2567
[2] https://git.buildroot.net/buildroot/commit/?id=7a23af4773665d2ee40e2d4e525746ebe38456dd