mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
@ 2023-01-11 10:19 Philipp Zabel
  2023-01-11 10:19 ` [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files Philipp Zabel
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Philipp Zabel @ 2023-01-11 10:19 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

https://mesonbuild.com/Release-notes-for-1-0-0.html

This bumps the host Python minimum version requirement from 3.6 to 3.7.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
GStreamer 1.22 will require Meson >= 0.62, which already introduced the
Python 3.7 dependency.
---
 ...-rpaths-for-build-directories-when-cross-co.patch |  6 +++---
 .../0002-HACK-enable-NEON-only-for-ARMv7.patch       | 12 ++++++------
 patches/{meson-0.61.4 => meson-1.0.0}/series         |  0
 rules/host-meson.make                                |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename patches/{meson-0.61.4 => meson-1.0.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%)
 rename patches/{meson-0.61.4 => meson-1.0.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (71%)
 rename patches/{meson-0.61.4 => meson-1.0.0}/series (100%)

diff --git a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index dc4b960b0302..efed46c1df60 100644
--- a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ b/patches/meson-1.0.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/linkers.py b/mesonbuild/linkers/linkers.py
-index c8489dafe11d..7440aa1a7c4e 100644
+index 3385dd3dcadd..7c15a212802e 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -660,7 +660,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 c8489dafe11d..7440aa1a7c4e 100644
          rpath_dirs_to_remove = set()
          for p in all_paths:
              rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
                  paths = padding
              else:
                  paths = paths + ':' + padding
diff --git a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 71%
rename from patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
index f6c355728034..263e1a76b552 100644
--- a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -6,14 +6,14 @@ NEON detection is broken, so just skip it for anything that is not ARMv7.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- mesonbuild/modules/unstable_simd.py | 3 +++
+ mesonbuild/modules/simd.py | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
-index 3339cea5a03f..da2e740d4cd3 100644
---- a/mesonbuild/modules/unstable_simd.py
-+++ b/mesonbuild/modules/unstable_simd.py
-@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
+diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
+index a33022d0435b..d40be3443776 100644
+--- a/mesonbuild/modules/simd.py
++++ b/mesonbuild/modules/simd.py
+@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
                  continue
              iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
              args = compiler.get_instruction_set_args(iset)
diff --git a/patches/meson-0.61.4/series b/patches/meson-1.0.0/series
similarity index 100%
rename from patches/meson-0.61.4/series
rename to patches/meson-1.0.0/series
diff --git a/rules/host-meson.make b/rules/host-meson.make
index 038db5570d89..c94b885641e6 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.61.4
-HOST_MESON_MD5		:= e894ff3492fd8a1ab4587b4f8e91f28f
+HOST_MESON_VERSION	:= 1.0.0
+HOST_MESON_MD5		:= 009b78125467cd9ee4d467175a5c12e1
 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.30.2




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files
  2023-01-11 10:19 [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Philipp Zabel
@ 2023-01-11 10:19 ` Philipp Zabel
  2023-02-08 11:49   ` [ptxdist] [APPLIED] " Michael Olbrich
  2023-01-11 11:02 ` [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Christian Melki
  2023-02-08 11:49 ` [ptxdist] [APPLIED] " Michael Olbrich
  2 siblings, 1 reply; 10+ messages in thread
From: Philipp Zabel @ 2023-01-11 10:19 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Set the pkgconfig.relocatable option to let Meson generate .pc files
that set a relative prefix, allowing installation at an arbitrary
path.

This removes the need to mangle the prefix setting after the fact
via scripts/lib/ptxd_make_world_install_mangle_pc.awk for Meson
based packages.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/pre/Rules.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 46f6f872e360..cb3e82804538 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -258,6 +258,7 @@ CROSS_MESON_USR := \
 	-Dbackend=ninja \
 	-Dbuildtype=debugoptimized \
 	-Dlibdir=$(CROSS_LIB_DIR) \
+	-Dpkgconfig.relocatable=true \
 	-Dprefix=/usr
 
 CROSS_MESON_ENV = \
-- 
2.30.2




^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 10:19 [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Philipp Zabel
  2023-01-11 10:19 ` [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files Philipp Zabel
@ 2023-01-11 11:02 ` Christian Melki
  2023-01-11 11:15   ` Ladislav Michl
  2023-01-11 11:17   ` Michael Olbrich
  2023-02-08 11:49 ` [ptxdist] [APPLIED] " Michael Olbrich
  2 siblings, 2 replies; 10+ messages in thread
From: Christian Melki @ 2023-01-11 11:02 UTC (permalink / raw)
  To: p.zabel, Michael Olbrich; +Cc: ptxdist

On 1/11/23 11:19, Philipp Zabel wrote:
> https://mesonbuild.com/Release-notes-for-1-0-0.html
> 
> This bumps the host Python minimum version requirement from 3.6 to 3.7.

Highly subjective disclaimer here,

This boils down to when ptxdist starts forcing users to python 3.7+ for
building. Calling python (as a build tool) outdated when the last 3.6.x
release was in late 2021, is a stretch.
I'm pro upgrade, but also really dislike breaking stuff like this.

> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> GStreamer 1.22 will require Meson >= 0.62, which already introduced the
> Python 3.7 dependency.
> ---
>  ...-rpaths-for-build-directories-when-cross-co.patch |  6 +++---
>  .../0002-HACK-enable-NEON-only-for-ARMv7.patch       | 12 ++++++------
>  patches/{meson-0.61.4 => meson-1.0.0}/series         |  0
>  rules/host-meson.make                                |  4 ++--
>  4 files changed, 11 insertions(+), 11 deletions(-)
>  rename patches/{meson-0.61.4 => meson-1.0.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%)
>  rename patches/{meson-0.61.4 => meson-1.0.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (71%)
>  rename patches/{meson-0.61.4 => meson-1.0.0}/series (100%)
> 
> diff --git a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 91%
> rename from patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index dc4b960b0302..efed46c1df60 100644
> --- a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-1.0.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/linkers.py b/mesonbuild/linkers/linkers.py
> -index c8489dafe11d..7440aa1a7c4e 100644
> +index 3385dd3dcadd..7c15a212802e 100644
>  --- a/mesonbuild/linkers/linkers.py
>  +++ b/mesonbuild/linkers/linkers.py
> -@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -660,7 +660,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 c8489dafe11d..7440aa1a7c4e 100644
>           rpath_dirs_to_remove = set()
>           for p in all_paths:
>               rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
>                   paths = padding
>               else:
>                   paths = paths + ':' + padding
> diff --git a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 71%
> rename from patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> index f6c355728034..263e1a76b552 100644
> --- a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> +++ b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> @@ -6,14 +6,14 @@ NEON detection is broken, so just skip it for anything that is not ARMv7.
>  
>  Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>  ---
> - mesonbuild/modules/unstable_simd.py | 3 +++
> + mesonbuild/modules/simd.py | 3 +++
>   1 file changed, 3 insertions(+)
>  
> -diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
> -index 3339cea5a03f..da2e740d4cd3 100644
> ---- a/mesonbuild/modules/unstable_simd.py
> -+++ b/mesonbuild/modules/unstable_simd.py
> -@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
> +diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
> +index a33022d0435b..d40be3443776 100644
> +--- a/mesonbuild/modules/simd.py
> ++++ b/mesonbuild/modules/simd.py
> +@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
>                   continue
>               iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
>               args = compiler.get_instruction_set_args(iset)
> diff --git a/patches/meson-0.61.4/series b/patches/meson-1.0.0/series
> similarity index 100%
> rename from patches/meson-0.61.4/series
> rename to patches/meson-1.0.0/series
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 038db5570d89..c94b885641e6 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.61.4
> -HOST_MESON_MD5		:= e894ff3492fd8a1ab4587b4f8e91f28f
> +HOST_MESON_VERSION	:= 1.0.0
> +HOST_MESON_MD5		:= 009b78125467cd9ee4d467175a5c12e1
>  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)




^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 11:02 ` [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Christian Melki
@ 2023-01-11 11:15   ` Ladislav Michl
  2023-01-11 11:20     ` Christian Melki
  2023-01-11 11:20     ` Michael Olbrich
  2023-01-11 11:17   ` Michael Olbrich
  1 sibling, 2 replies; 10+ messages in thread
From: Ladislav Michl @ 2023-01-11 11:15 UTC (permalink / raw)
  To: ptxdist, christian.melki; +Cc: Michael Olbrich, p.zabel

On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> On 1/11/23 11:19, Philipp Zabel wrote:
> > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > 
> > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> 
> Highly subjective disclaimer here,
> 
> This boils down to when ptxdist starts forcing users to python 3.7+ for
> building. Calling python (as a build tool) outdated when the last 3.6.x
> release was in late 2021, is a stretch.
> I'm pro upgrade, but also really dislike breaking stuff like this.

python3 package, therefore host-python as well is already at 3.10.4,
so it does not make any difference.

	l.



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 11:02 ` [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Christian Melki
  2023-01-11 11:15   ` Ladislav Michl
@ 2023-01-11 11:17   ` Michael Olbrich
  1 sibling, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2023-01-11 11:17 UTC (permalink / raw)
  To: Christian Melki; +Cc: ptxdist, p.zabel

On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> On 1/11/23 11:19, Philipp Zabel wrote:
> > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > 
> > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> 
> Highly subjective disclaimer here,
> 
> This boils down to when ptxdist starts forcing users to python 3.7+ for
> building. Calling python (as a build tool) outdated when the last 3.6.x
> release was in late 2021, is a stretch.
> I'm pro upgrade, but also really dislike breaking stuff like this.

Currently we have that last meson version that supports Python 3.6.x. I've
been delaying the update for this reason. However, the next GStreamer
release will require a newer meson version, so at that point we'll need to
update.

Michael

> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> > GStreamer 1.22 will require Meson >= 0.62, which already introduced the
> > Python 3.7 dependency.
> > ---
> >  ...-rpaths-for-build-directories-when-cross-co.patch |  6 +++---
> >  .../0002-HACK-enable-NEON-only-for-ARMv7.patch       | 12 ++++++------
> >  patches/{meson-0.61.4 => meson-1.0.0}/series         |  0
> >  rules/host-meson.make                                |  4 ++--
> >  4 files changed, 11 insertions(+), 11 deletions(-)
> >  rename patches/{meson-0.61.4 => meson-1.0.0}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (91%)
> >  rename patches/{meson-0.61.4 => meson-1.0.0}/0002-HACK-enable-NEON-only-for-ARMv7.patch (71%)
> >  rename patches/{meson-0.61.4 => meson-1.0.0}/series (100%)
> > 
> > diff --git a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> > similarity index 91%
> > rename from patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> > rename to patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> > index dc4b960b0302..efed46c1df60 100644
> > --- a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> > +++ b/patches/meson-1.0.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/linkers.py b/mesonbuild/linkers/linkers.py
> > -index c8489dafe11d..7440aa1a7c4e 100644
> > +index 3385dd3dcadd..7c15a212802e 100644
> >  --- a/mesonbuild/linkers/linkers.py
> >  +++ b/mesonbuild/linkers/linkers.py
> > -@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
> > +@@ -660,7 +660,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 c8489dafe11d..7440aa1a7c4e 100644
> >           rpath_dirs_to_remove = set()
> >           for p in all_paths:
> >               rpath_dirs_to_remove.add(p.encode('utf8'))
> > -@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
> > +@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
> >                   paths = padding
> >               else:
> >                   paths = paths + ':' + padding
> > diff --git a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> > similarity index 71%
> > rename from patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> > rename to patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> > index f6c355728034..263e1a76b552 100644
> > --- a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> > +++ b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> > @@ -6,14 +6,14 @@ NEON detection is broken, so just skip it for anything that is not ARMv7.
> >  
> >  Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> >  ---
> > - mesonbuild/modules/unstable_simd.py | 3 +++
> > + mesonbuild/modules/simd.py | 3 +++
> >   1 file changed, 3 insertions(+)
> >  
> > -diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
> > -index 3339cea5a03f..da2e740d4cd3 100644
> > ---- a/mesonbuild/modules/unstable_simd.py
> > -+++ b/mesonbuild/modules/unstable_simd.py
> > -@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
> > +diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
> > +index a33022d0435b..d40be3443776 100644
> > +--- a/mesonbuild/modules/simd.py
> > ++++ b/mesonbuild/modules/simd.py
> > +@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
> >                   continue
> >               iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
> >               args = compiler.get_instruction_set_args(iset)
> > diff --git a/patches/meson-0.61.4/series b/patches/meson-1.0.0/series
> > similarity index 100%
> > rename from patches/meson-0.61.4/series
> > rename to patches/meson-1.0.0/series
> > diff --git a/rules/host-meson.make b/rules/host-meson.make
> > index 038db5570d89..c94b885641e6 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.61.4
> > -HOST_MESON_MD5		:= e894ff3492fd8a1ab4587b4f8e91f28f
> > +HOST_MESON_VERSION	:= 1.0.0
> > +HOST_MESON_MD5		:= 009b78125467cd9ee4d467175a5c12e1
> >  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)
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 11:15   ` Ladislav Michl
@ 2023-01-11 11:20     ` Christian Melki
  2023-01-11 11:20     ` Michael Olbrich
  1 sibling, 0 replies; 10+ messages in thread
From: Christian Melki @ 2023-01-11 11:20 UTC (permalink / raw)
  To: Ladislav Michl; +Cc: Michael Olbrich, ptxdist, p.zabel

On 1/11/23 12:15, Ladislav Michl wrote:
> On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
>> On 1/11/23 11:19, Philipp Zabel wrote:
>>> https://mesonbuild.com/Release-notes-for-1-0-0.html
>>>
>>> This bumps the host Python minimum version requirement from 3.6 to 3.7.
>>
>> Highly subjective disclaimer here,
>>
>> This boils down to when ptxdist starts forcing users to python 3.7+ for
>> building. Calling python (as a build tool) outdated when the last 3.6.x
>> release was in late 2021, is a stretch.
>> I'm pro upgrade, but also really dislike breaking stuff like this.
> 
> python3 package, therefore host-python as well is already at 3.10.4,
> so it does not make any difference.
> 

I don't follow.
I'm talking about host-meson requires host-system-python3.

> 	l.




^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 11:15   ` Ladislav Michl
  2023-01-11 11:20     ` Christian Melki
@ 2023-01-11 11:20     ` Michael Olbrich
  2023-01-11 13:14       ` Ladislav Michl
  1 sibling, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2023-01-11 11:20 UTC (permalink / raw)
  To: Ladislav Michl; +Cc: christian.melki, ptxdist, p.zabel

On Wed, Jan 11, 2023 at 12:15:38PM +0100, Ladislav Michl wrote:
> On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> > On 1/11/23 11:19, Philipp Zabel wrote:
> > > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > > 
> > > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> > 
> > Highly subjective disclaimer here,
> > 
> > This boils down to when ptxdist starts forcing users to python 3.7+ for
> > building. Calling python (as a build tool) outdated when the last 3.6.x
> > release was in late 2021, is a stretch.
> > I'm pro upgrade, but also really dislike breaking stuff like this.
> 
> python3 package, therefore host-python as well is already at 3.10.4,
> so it does not make any difference.

No, currently host-python is only for building target python packages. Not
for build tools that use python. We use the system python for that.

I've thought about changing that optionally. In that case,
host-system-python3 would select host-python3. But so far, I've not seen a
real need for it, because all reasonable Distros have a python that is
sufficiently new.

Michael


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 11:20     ` Michael Olbrich
@ 2023-01-11 13:14       ` Ladislav Michl
  0 siblings, 0 replies; 10+ messages in thread
From: Ladislav Michl @ 2023-01-11 13:14 UTC (permalink / raw)
  To: ptxdist, christian.melki, p.zabel

On Wed, Jan 11, 2023 at 12:20:34PM +0100, Michael Olbrich wrote:
> On Wed, Jan 11, 2023 at 12:15:38PM +0100, Ladislav Michl wrote:
> > On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> > > On 1/11/23 11:19, Philipp Zabel wrote:
> > > > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > > > 
> > > > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> > > 
> > > Highly subjective disclaimer here,
> > > 
> > > This boils down to when ptxdist starts forcing users to python 3.7+ for
> > > building. Calling python (as a build tool) outdated when the last 3.6.x
> > > release was in late 2021, is a stretch.
> > > I'm pro upgrade, but also really dislike breaking stuff like this.
> > 
> > python3 package, therefore host-python as well is already at 3.10.4,
> > so it does not make any difference.
> 
> No, currently host-python is only for building target python packages. Not
> for build tools that use python. We use the system python for that.

Ah, thank you clarifying that.

> I've thought about changing that optionally. In that case,
> host-system-python3 would select host-python3. But so far, I've not seen a
> real need for it, because all reasonable Distros have a python that is
> sufficiently new.

In that unprobable case you'll end doing so, I would appreciate generic
mechanism of replacing host-system-* packages with host-* ones. Then
configure.ac could look only for bare minimum, while the rest could
be built later. scripts/kconfig included, so ptxdist would run out
of the box.

	l



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [APPLIED] host-meson: version bump 0.61.4 -> 1.0.0
  2023-01-11 10:19 [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Philipp Zabel
  2023-01-11 10:19 ` [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files Philipp Zabel
  2023-01-11 11:02 ` [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Christian Melki
@ 2023-02-08 11:49 ` Michael Olbrich
  2 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2023-02-08 11:49 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as f4c1eef532470e269422d7ecc318e081b1e2af42.

Michael

[sent from post-receive hook]

On Wed, 08 Feb 2023 12:49:31 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> https://mesonbuild.com/Release-notes-for-1-0-0.html
> 
> This bumps the host Python minimum version requirement from 3.6 to 3.7.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230111101916.3749538-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 91%
> rename from patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-1.0.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index dc4b960b0302..efed46c1df60 100644
> --- a/patches/meson-0.61.4/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-1.0.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/linkers.py b/mesonbuild/linkers/linkers.py
> -index c8489dafe11d..7440aa1a7c4e 100644
> +index 3385dd3dcadd..7c15a212802e 100644
>  --- a/mesonbuild/linkers/linkers.py
>  +++ b/mesonbuild/linkers/linkers.py
> -@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -660,7 +660,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 c8489dafe11d..7440aa1a7c4e 100644
>           rpath_dirs_to_remove = set()
>           for p in all_paths:
>               rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -688,7 +691,8 @@ class GnuLikeDynamicLinkerMixin:
>                   paths = padding
>               else:
>                   paths = paths + ':' + padding
> diff --git a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 71%
> rename from patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> index f6c355728034..263e1a76b552 100644
> --- a/patches/meson-0.61.4/0002-HACK-enable-NEON-only-for-ARMv7.patch
> +++ b/patches/meson-1.0.0/0002-HACK-enable-NEON-only-for-ARMv7.patch
> @@ -6,14 +6,14 @@ NEON detection is broken, so just skip it for anything that is not ARMv7.
>  
>  Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>  ---
> - mesonbuild/modules/unstable_simd.py | 3 +++
> + mesonbuild/modules/simd.py | 3 +++
>   1 file changed, 3 insertions(+)
>  
> -diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
> -index 3339cea5a03f..da2e740d4cd3 100644
> ---- a/mesonbuild/modules/unstable_simd.py
> -+++ b/mesonbuild/modules/unstable_simd.py
> -@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
> +diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
> +index a33022d0435b..d40be3443776 100644
> +--- a/mesonbuild/modules/simd.py
> ++++ b/mesonbuild/modules/simd.py
> +@@ -63,6 +63,9 @@ class SimdModule(ExtensionModule):
>                   continue
>               iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
>               args = compiler.get_instruction_set_args(iset)
> diff --git a/patches/meson-0.61.4/series b/patches/meson-1.0.0/series
> similarity index 100%
> rename from patches/meson-0.61.4/series
> rename to patches/meson-1.0.0/series
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 574ed064a150..08b62748d8e0 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.61.4
> -HOST_MESON_MD5		:= e894ff3492fd8a1ab4587b4f8e91f28f
> +HOST_MESON_VERSION	:= 1.0.0
> +HOST_MESON_MD5		:= 009b78125467cd9ee4d467175a5c12e1
>  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)



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [APPLIED] pre/Rules.make: let Meson generate relocatable .pc files
  2023-01-11 10:19 ` [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files Philipp Zabel
@ 2023-02-08 11:49   ` Michael Olbrich
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Olbrich @ 2023-02-08 11:49 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as cd37b00b302366a2044316967547cabd2c3f8d59.

Michael

[sent from post-receive hook]

On Wed, 08 Feb 2023 12:49:32 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Set the pkgconfig.relocatable option to let Meson generate .pc files
> that set a relative prefix, allowing installation at an arbitrary
> path.
> 
> This removes the need to mangle the prefix setting after the fact
> via scripts/lib/ptxd_make_world_install_mangle_pc.awk for Meson
> based packages.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230111101916.3749538-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
> index fd12a3462ae8..6d9b840cdc87 100644
> --- a/rules/pre/Rules.make
> +++ b/rules/pre/Rules.make
> @@ -258,6 +258,7 @@ CROSS_MESON_USR := \
>  	-Dbackend=ninja \
>  	-Dbuildtype=debugoptimized \
>  	-Dlibdir=$(CROSS_LIB_DIR) \
> +	-Dpkgconfig.relocatable=true \
>  	-Dprefix=/usr
>  
>  CROSS_MESON_ENV = \



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-02-08 11:49 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-11 10:19 [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Philipp Zabel
2023-01-11 10:19 ` [ptxdist] [PATCH 2/2] pre/Rules.make: let Meson generate relocatable .pc files Philipp Zabel
2023-02-08 11:49   ` [ptxdist] [APPLIED] " Michael Olbrich
2023-01-11 11:02 ` [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0 Christian Melki
2023-01-11 11:15   ` Ladislav Michl
2023-01-11 11:20     ` Christian Melki
2023-01-11 11:20     ` Michael Olbrich
2023-01-11 13:14       ` Ladislav Michl
2023-01-11 11:17   ` Michael Olbrich
2023-02-08 11:49 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox