[Buildroot] [PATCH] meson: bump version to 0.48.1
Peter Seiderer
ps.report at gmx.net
Fri Oct 19 18:37:46 UTC 2018
On Fri, 19 Oct 2018 20:30:50 +0200, Peter Seiderer <ps.report at gmx.net> wrote:
> Hello Eric,
>
> On Thu, 18 Oct 2018 22:44:31 +0200, Eric Le Bihan <eric.le.bihan.dev at free.fr> wrote:
>
> > Bump version to 0.48.1 and re-add the RPATH patch.
> >
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev at free.fr>
> > ---
> > ...y-fix-RPATH-if-install_rpath-is-not-empty.patch | 31 ++++++++++++++++++++++
> > package/meson/meson.hash | 4 +--
> > package/meson/meson.mk | 2 +-
> > 3 files changed, 34 insertions(+), 3 deletions(-)
> > create mode 100644 package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
> >
> > diff --git a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
> > new file mode 100644
> > index 0000000000..752042f7ec
> > --- /dev/null
> > +++ b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
> > @@ -0,0 +1,31 @@
> > +From cb5af88b1102ea8379323f95b9588c0bef71f175 Mon Sep 17 00:00:00 2001
> > +From: Eric Le Bihan <eric.le.bihan.dev at free.fr>
> > +Date: Sat, 14 Jul 2018 11:18:45 +0200
> > +Subject: [PATCH] Only fix RPATH if install_rpath is not empty
> > +
>
> Signed-off-by line missing here...
>
> > +---
> > + mesonbuild/minstall.py | 8 ++++++++
> > + 1 file changed, 8 insertions(+)
> > +
> > +diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
> > +index 4615b6dd..dd476ea8 100644
> > +--- a/mesonbuild/minstall.py
> > ++++ b/mesonbuild/minstall.py
> > +@@ -440,6 +440,14 @@ class Installer:
> > + 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.14.4
> > +
> > diff --git a/package/meson/meson.hash b/package/meson/meson.hash
> > index 4a4923bd12..656f51f01d 100644
> > --- a/package/meson/meson.hash
> > +++ b/package/meson/meson.hash
> > @@ -1,4 +1,4 @@
> > # Locally calculated after checking pgp signature
> > -# https://github.com/mesonbuild/meson/releases/download/0.47.1/meson-0.47.1.tar.gz.asc
> > -sha256 d673de79f7bab064190a5ea06140eaa8415efb386d0121ba549f6d66c555ada6 meson-0.47.1.tar.gz
> > +# https://github.com/mesonbuild/meson/releases/download/0.48.1/meson-0.48.1.tar.gz.asc
> > +sha256 425d12edbb81498314926afa93a3eb2fca4ca6929cbe0f8abeb6ab45d1d9fa8f meson-0.48.1.tar.gz
> > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
> > diff --git a/package/meson/meson.mk b/package/meson/meson.mk
> > index 08e5c505c9..f24aef06fc 100644
> > --- a/package/meson/meson.mk
> > +++ b/package/meson/meson.mk
> > @@ -4,7 +4,7 @@
> > #
> > ################################################################################
> >
> > -MESON_VERSION = 0.47.1
> > +MESON_VERSION = 0.48.1
> > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
> > MESON_LICENSE = Apache-2.0
> > MESON_LICENSE_FILES = COPYING
>
> With the patch applied I get the following error:
>
> >>> host-meson 0.48.1 Building
> (cd .../build/host-meson-0.48.1//; PATH=".../host/bin:.../host/sbin:/usr/local/bin:/usr/bin:/bin:/usr/lib/mit/sbin" PYTHONNOUSERSITE=1 .../host/bin/python3 setup.py build )
> Traceback (most recent call last):
> File "setup.py", line 26, in <module>
> from setuptools import setup
> ModuleNotFoundError: No module named 'setuptools'
>
> $ ls -d build/host-python*
> build/host-python-2.7.15
> build/host-python3-3.7.0
> build/host-python-setuptools-40.0.0
graph-depends.pdf shows the following host-meson dependencies:
- host-meson --> host-python3
- host-meson --> host-python-setuptools --> host-python
- host-meson --> host-ninja --> host-python
Maybe host-python-setuptools are build for the wrong python version (python2 instead of python3)?
Regards,
Peter
>
> Regards,
> Peter
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
More information about the buildroot
mailing list