package/meson: bump to version 0.55.0
PATCH v3 1/1 package/meson: bump to version 0.55.0
Drop fix rpath patch which is no longer needed.
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.
---
Changes v1 -> v2:
- cleanup make-sq-comma-list syntax
Changes v2 -> v3:
- remove rpath patch
---
...-RPATH-if-install_rpath-is-not-empty.patch | 36 ---------
...ic-libs-when-default-library-static.patch} | 8 +-
...encies-base.py-add-pkg_config_stati.patch} | 8 +-
...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 -------------------
package/meson/meson.hash | 4 +-
package/meson/meson.mk | 2 +-
package/pkg-meson.mk | 12 +--
support/misc/utils.mk | 4 +
8 files changed, 21 insertions(+), 127 deletions(-)
delete mode 100644 package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
rename package/meson/{0002-Prefer-ext-static-libs-when-default-library-static.patch => 0001-Prefer-ext-static-libs-when-default-library-static.patch} (91%)
rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)
delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patchpackage/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd 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 - -Signed-off-by: Eric Le Bihan <[email protected]> -[Fix: remove leftover from original/unconditional code] -Signed-off-by: Peter Seiderer <[email protected]> ---- - mesonbuild/minstall.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 8ac6aab1..7ef04116 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -489,8 +489,14 @@ class Installer: - printed_symlink_error = True - if os.path.isfile(outname): - try: -- depfixer.fix_rpath(outname, 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, -+ install_name_mappings, verbose=False) -+ else: -+ print("Skipping RPATH fixing") - except SystemExit as e: - if isinstance(e.code, int) and e.code == 0: - pass --- -2.20.1 -
package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch renamed from 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/0002-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/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/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
Thomas Petazzoni
AppliedPATCH v3 1/1 package/meson: bump to version 0.55.0
Quoted 15 lines · On Fri, 17 Jul 2020 02:03:56 -0600 James Hilliard <[email protected]>…
Drop fix rpath patch which is no longer needed.
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]>---
Changes v1 -> v2:
- cleanup make-sq-comma-list syntax
Changes v2 -> v3:
- remove rpath patch
Quoted 14 lines
---
...-RPATH-if-install_rpath-is-not-empty.patch | 36 ---------
...ic-libs-when-default-library-static.patch} | 8 +-
...encies-base.py-add-pkg_config_stati.patch} | 8 +-
...-g-ir-scanner-and-g-ir-compiler-bina.patch | 74 -------------------
package/meson/meson.hash | 4 +-
package/meson/meson.mk | 2 +-
package/pkg-meson.mk | 12 +--
support/misc/utils.mk | 4 +
8 files changed, 21 insertions(+), 127 deletions(-)
delete mode 100644 package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
rename package/meson/{0002-Prefer-ext-static-libs-when-default-library-static.patch => 0001-Prefer-ext-static-libs-when-default-library-static.patch} (91%)
rename package/meson/{0004-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch => 0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch} (95%)
delete mode 100644 package/meson/0003-Allow-overriding-g-ir-scanner-and-g-ir-compiler-bina.patchApplied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com