From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] host-meson: version bump 0.55.0 -> 0.56.0
Date: Mon, 7 Dec 2020 08:55:58 +0100 [thread overview]
Message-ID: <20201207075558.GB3717075@pengutronix.de> (raw)
In-Reply-To: <20201130143009.31159-1-p.zabel@pengutronix.de>
On Mon, Nov 30, 2020 at 03:30:09PM +0100, Philipp Zabel wrote:
> Drop obsolete patches:
>
> "[PATCH] only use paths for shared libaries in get_link_dep_subdirs()"
> is replaced by commit 804a71e8f2b7 ("Do not add rpaths for static libs.
> Closes #5191.")
>
> "[PATCH] qt dependency: do not require all the tools automatically" was
> backported from 4a923b699b5e ("qt dependency: do not require all the
> tools automatically")
Do you need this version for something? This version bumps the Python
requirement to 3.6 and there are still some LST distros out there that use
Python 3.5 so I'd like to stick with the old version for a bit longer.
Michael
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> ...or-shared-libaries-in-get_link_dep_s.patch | 26 ---------
> ...-not-require-all-the-tools-automatic.patch | 55 -------------------
> patches/meson-0.55.0/series | 7 ---
> ...for-build-directories-when-cross-co.patch} | 6 +-
> ...002-HACK-enable-NEON-only-for-ARMv7.patch} | 0
> patches/meson-0.56.0/series | 5 ++
> rules/host-meson.make | 4 +-
> 7 files changed, 10 insertions(+), 93 deletions(-)
> delete mode 100644 patches/meson-0.55.0/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
> delete mode 100644 patches/meson-0.55.0/0003-qt-dependency-do-not-require-all-the-tools-automatic.patch
> delete mode 100644 patches/meson-0.55.0/series
> rename patches/{meson-0.55.0/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch => meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch} (91%)
> rename patches/{meson-0.55.0/0004-HACK-enable-NEON-only-for-ARMv7.patch => meson-0.56.0/0002-HACK-enable-NEON-only-for-ARMv7.patch} (100%)
> create mode 100644 patches/meson-0.56.0/series
>
> diff --git a/patches/meson-0.55.0/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch b/patches/meson-0.55.0/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
> deleted file mode 100644
> index 3a98d8a0d135..000000000000
> --- a/patches/meson-0.55.0/0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Mon, 18 Mar 2019 10:41:08 +0100
> -Subject: [PATCH] only use paths for shared libaries in get_link_dep_subdirs()
> -
> -This is used for -rpath / -rpath-link. So paths for anything else make no
> -sense.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - mesonbuild/build.py | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/mesonbuild/build.py b/mesonbuild/build.py
> -index d7f3b66c461d..83acf43db508 100644
> ---- a/mesonbuild/build.py
> -+++ b/mesonbuild/build.py
> -@@ -819,7 +819,8 @@ class BuildTarget(Target):
> - def get_link_dep_subdirs(self):
> - result = OrderedSet()
> - for i in self.link_targets:
> -- result.add(i.get_subdir())
> -+ if isinstance(i, SharedLibrary):
> -+ result.add(i.get_subdir())
> - result.update(i.get_link_dep_subdirs())
> - return result
> -
> diff --git a/patches/meson-0.55.0/0003-qt-dependency-do-not-require-all-the-tools-automatic.patch b/patches/meson-0.55.0/0003-qt-dependency-do-not-require-all-the-tools-automatic.patch
> deleted file mode 100644
> index 82c6aa8ea5da..000000000000
> --- a/patches/meson-0.55.0/0003-qt-dependency-do-not-require-all-the-tools-automatic.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From: Eli Schwartz <eschwartz@archlinux.org>
> -Date: Thu, 6 Aug 2020 19:55:58 -0400
> -Subject: [PATCH] qt dependency: do not require all the tools automatically
> -
> -The compilers_detect function is only used in the qt module, which
> -checks every time before using a specific compiler, if it is found.
> -
> -e.g.
> -
> - meson.build:10:6: ERROR: MOC sources specified and couldn't find moc-qt5, please check your qt5 installation
> -
> -In fact, the current check means we never even hit this error to begin
> -with, because we previously died on the uninformative error:
> -
> - meson.build:10:6: ERROR: Program(s) ['moc'] not found or not executable
> -
> -which doesn't actually tell the user why this matters, and is all around
> -a waste of time.
> -
> -Fixes #5582
> ----
> - mesonbuild/dependencies/ui.py | 10 +++++-----
> - 1 file changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
> -index 95dfe2b93bb4..5dffd3a407ad 100644
> ---- a/mesonbuild/dependencies/ui.py
> -+++ b/mesonbuild/dependencies/ui.py
> -@@ -234,13 +234,13 @@ class QtBaseDependency(ExternalDependency):
> - def gen_bins():
> - for b in bins:
> - if self.bindir:
> -- yield os.path.join(self.bindir, b), b, False
> -+ yield os.path.join(self.bindir, b), b
> - # prefer the <tool>-qt<version> of the tool to the plain one, as we
> - # don't know what the unsuffixed one points to without calling it.
> -- yield '{}-{}'.format(b, self.name), b, False
> -- yield b, b, self.required if b != 'lrelease' else False
> -+ yield '{}-{}'.format(b, self.name), b
> -+ yield b, b
> -
> -- for b, name, required in gen_bins():
> -+ for b, name in gen_bins():
> - if found[name].found():
> - continue
> -
> -@@ -260,7 +260,7 @@ class QtBaseDependency(ExternalDependency):
> - care = err
> - return care.split(' ')[-1].replace(')', '')
> -
> -- p = interp_obj.find_program_impl([b], required=required,
> -+ p = interp_obj.find_program_impl([b], required=False,
> - version_func=get_version,
> - wanted=wanted).held_object
> - if p.found():
> diff --git a/patches/meson-0.55.0/series b/patches/meson-0.55.0/series
> deleted file mode 100644
> index 6eeb51c02b54..000000000000
> --- a/patches/meson-0.55.0/series
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-only-use-paths-for-shared-libaries-in-get_link_dep_s.patch
> -0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> -0003-qt-dependency-do-not-require-all-the-tools-automatic.patch
> -0004-HACK-enable-NEON-only-for-ARMv7.patch
> -# 24bdfd2337ffc34a785ba69d7789246a - git-ptx-patches magic
> diff --git a/patches/meson-0.55.0/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 91%
> rename from patches/meson-0.55.0/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index 811409ab7ae1..ccf5bfc2ff09 100644
> --- a/patches/meson-0.55.0/0002-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-0.56.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
> -index 4264e7da229b..70a80a2c99f2 100644
> +index 589945c511ff..59463bdfdcc5 100644
> --- a/mesonbuild/linkers.py
> +++ b/mesonbuild/linkers.py
> -@@ -575,7 +575,10 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -605,7 +605,10 @@ class GnuLikeDynamicLinkerMixin:
> # Need to deduplicate rpaths, as macOS's install_name_tool
> # is *very* allergic to duplicate -delete_rpath arguments
> # when calling depfixer on installation.
> @@ -26,7 +26,7 @@ index 4264e7da229b..70a80a2c99f2 100644
> rpath_dirs_to_remove = set()
> for p in all_paths:
> rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -603,7 +606,8 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -633,7 +636,8 @@ class GnuLikeDynamicLinkerMixin:
> paths = padding
> else:
> paths = paths + ':' + padding
> diff --git a/patches/meson-0.55.0/0004-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.56.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 100%
> rename from patches/meson-0.55.0/0004-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-0.56.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> diff --git a/patches/meson-0.56.0/series b/patches/meson-0.56.0/series
> new file mode 100644
> index 000000000000..3c8852cdea85
> --- /dev/null
> +++ b/patches/meson-0.56.0/series
> @@ -0,0 +1,5 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +0002-HACK-enable-NEON-only-for-ARMv7.patch
> +# 0a496d0bc50051baaa87da126e867c5c - git-ptx-patches magic
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 92b4b1276499..98c4e453ba36 100644
> --- a/rules/host-meson.make
> +++ b/rules/host-meson.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
> #
> # Paths and names
> #
> -HOST_MESON_VERSION := 0.55.0
> -HOST_MESON_MD5 := 9dd395356f7ec6ef40e2449fc9db3771
> +HOST_MESON_VERSION := 0.56.0
> +HOST_MESON_MD5 := 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
> HOST_MESON := meson-$(HOST_MESON_VERSION)
> HOST_MESON_SUFFIX := tar.gz
> HOST_MESON_URL := https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2020-12-07 7:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 14:30 Philipp Zabel
2020-12-07 7:55 ` Michael Olbrich [this message]
2020-12-07 8:35 ` Philipp Zabel
2020-12-07 10:55 ` Michael Olbrich
2020-12-11 7:14 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201207075558.GB3717075@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox