[PATCH 0/2] Some build fixes

[PATCH 0/2] Some build fixes

[marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA]

From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Hi,

Here are some build fixes patches for DTC.

Marc-André Lureau (2):
  Revert "libfdt: Add static lib to meson build"
  setup.py: fix out of tree build

 libfdt/meson.build | 5 -----
 setup.py           | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

-- 
2.34.1.8.g35151cf07204

[PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA]

From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

You can build the static library by running meson configure
-Ddefault_library=both or static.

This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.

Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 libfdt/meson.build | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libfdt/meson.build b/libfdt/meson.build
index 71f29b61e870..0307ffb8d7b9 100644
--- a/libfdt/meson.build
+++ b/libfdt/meson.build
@@ -24,11 +24,6 @@ libfdt = library(
   install: true,
 )
 
-libfdt_a = static_library(
-  'fdt', sources,
-  install: true,
-)
-
 libfdt_inc = include_directories('.')
 
 libfdt_dep = declare_dependency(
-- 
2.34.1.8.g35151cf07204

Re: [PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[Simon Glass]

Hi Marc-André,

On Mon, 3 Jan 2022 at 00:39, <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
> From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>
> You can build the static library by running meson configure
> -Ddefault_library=both or static.
>
> This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.

What is the reason for the revert?

Regards,
Simon

>
> Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  libfdt/meson.build | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/libfdt/meson.build b/libfdt/meson.build
> index 71f29b61e870..0307ffb8d7b9 100644
> --- a/libfdt/meson.build
> +++ b/libfdt/meson.build
> @@ -24,11 +24,6 @@ libfdt = library(
>    install: true,
>  )
>
> -libfdt_a = static_library(
> -  'fdt', sources,
> -  install: true,
> -)
> -
>  libfdt_inc = include_directories('.')
>
>  libfdt_dep = declare_dependency(
> --
> 2.34.1.8.g35151cf07204
>

Re: [PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[Marc-André Lureau]

Hi Simon

On Mon, Jan 3, 2022 at 1:59 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
>
> Hi Marc-André,
>
> On Mon, 3 Jan 2022 at 00:39, <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> >
> > From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> >
> > You can build the static library by running meson configure
> > -Ddefault_library=both or static.
> >
> > This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.
>
> What is the reason for the revert?

Did you miss the comment above?

There is no need to have a static_library() to build a static library.
library() handles both kinds, you just have to specify with the
-Ddefault_library option what you want.

> Regards,
> Simon
>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> >  libfdt/meson.build | 5 -----
> >  1 file changed, 5 deletions(-)
> >
> > diff --git a/libfdt/meson.build b/libfdt/meson.build
> > index 71f29b61e870..0307ffb8d7b9 100644
> > --- a/libfdt/meson.build
> > +++ b/libfdt/meson.build
> > @@ -24,11 +24,6 @@ libfdt = library(
> >    install: true,
> >  )
> >
> > -libfdt_a = static_library(
> > -  'fdt', sources,
> > -  install: true,
> > -)
> > -
> >  libfdt_inc = include_directories('.')
> >
> >  libfdt_dep = declare_dependency(
> > --
> > 2.34.1.8.g35151cf07204
> >
>

Re: [PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[Simon Glass]

Hi Marc-André,

On Mon, 3 Jan 2022 at 03:04, Marc-André Lureau
<marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
> Hi Simon
>
> On Mon, Jan 3, 2022 at 1:59 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
> >
> > Hi Marc-André,
> >
> > On Mon, 3 Jan 2022 at 00:39, <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > >
> > > From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > >
> > > You can build the static library by running meson configure
> > > -Ddefault_library=both or static.
> > >
> > > This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.
> >
> > What is the reason for the revert?
>
> Did you miss the comment above?

I think you alluded to it but it is good to be explicit as to the motivation.

>
> There is no need to have a static_library() to build a static library.
> library() handles both kinds, you just have to specify with the
> -Ddefault_library option what you want.

But don't we want the standard build to produce both static and
dynamic libraries?

Regards,
Simon

> > > Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > ---
> > >  libfdt/meson.build | 5 -----
> > >  1 file changed, 5 deletions(-)
> > >
> > > diff --git a/libfdt/meson.build b/libfdt/meson.build
> > > index 71f29b61e870..0307ffb8d7b9 100644
> > > --- a/libfdt/meson.build
> > > +++ b/libfdt/meson.build
> > > @@ -24,11 +24,6 @@ libfdt = library(
> > >    install: true,
> > >  )
> > >
> > > -libfdt_a = static_library(
> > > -  'fdt', sources,
> > > -  install: true,
> > > -)
> > > -
> > >  libfdt_inc = include_directories('.')
> > >
> > >  libfdt_dep = declare_dependency(
> > > --
> > > 2.34.1.8.g35151cf07204
> > >
> >
>

Re: [PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[Marc-André Lureau]

Hi Simon

On Mon, Jan 3, 2022 at 2:18 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
>
> Hi Marc-André,
>
> On Mon, 3 Jan 2022 at 03:04, Marc-André Lureau
> <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> >
> > Hi Simon
> >
> > On Mon, Jan 3, 2022 at 1:59 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
> > >
> > > Hi Marc-André,
> > >
> > > On Mon, 3 Jan 2022 at 00:39, <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > > >
> > > > From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > >
> > > > You can build the static library by running meson configure
> > > > -Ddefault_library=both or static.
> > > >
> > > > This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.
> > >
> > > What is the reason for the revert?
> >
> > Did you miss the comment above?
>
> I think you alluded to it but it is good to be explicit as to the motivation.
>
> >
> > There is no need to have a static_library() to build a static library.
> > library() handles both kinds, you just have to specify with the
> > -Ddefault_library option what you want.
>
> But don't we want the standard build to produce both static and
> dynamic libraries?
>

If we wanted that (this is not the most common option these days), the
recommended way is to set project() default_options.

> Regards,
> Simon
>
> > > > Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > > ---
> > > >  libfdt/meson.build | 5 -----
> > > >  1 file changed, 5 deletions(-)
> > > >
> > > > diff --git a/libfdt/meson.build b/libfdt/meson.build
> > > > index 71f29b61e870..0307ffb8d7b9 100644
> > > > --- a/libfdt/meson.build
> > > > +++ b/libfdt/meson.build
> > > > @@ -24,11 +24,6 @@ libfdt = library(
> > > >    install: true,
> > > >  )
> > > >
> > > > -libfdt_a = static_library(
> > > > -  'fdt', sources,
> > > > -  install: true,
> > > > -)
> > > > -
> > > >  libfdt_inc = include_directories('.')
> > > >
> > > >  libfdt_dep = declare_dependency(
> > > > --
> > > > 2.34.1.8.g35151cf07204
> > > >
> > >
> >
>

Re: [PATCH 1/2] Revert "libfdt: Add static lib to meson build"

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]

On Mon, Jan 03, 2022 at 02:22:32PM +0400, Marc-André Lureau wrote:
> Hi Simon
> 
> On Mon, Jan 3, 2022 at 2:18 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
> >
> > Hi Marc-André,
> >
> > On Mon, 3 Jan 2022 at 03:04, Marc-André Lureau
> > <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > >
> > > Hi Simon
> > >
> > > On Mon, Jan 3, 2022 at 1:59 PM Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
> > > >
> > > > Hi Marc-André,
> > > >
> > > > On Mon, 3 Jan 2022 at 00:39, <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> > > > >
> > > > > From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > > >
> > > > > You can build the static library by running meson configure
> > > > > -Ddefault_library=both or static.
> > > > >
> > > > > This reverts commit 5216f3f1bbb70aef463b6cd78dbbb0f4c4c71606.
> > > >
> > > > What is the reason for the revert?
> > >
> > > Did you miss the comment above?
> >
> > I think you alluded to it but it is good to be explicit as to the motivation.
> >
> > >
> > > There is no need to have a static_library() to build a static library.
> > > library() handles both kinds, you just have to specify with the
> > > -Ddefault_library option what you want.
> >
> > But don't we want the standard build to produce both static and
> > dynamic libraries?
> 
> If we wanted that (this is not the most common option these days), the
> recommended way is to set project() default_options.

Hmm.. the existing make behaviour is to build both libraries by
default, so I'd prefer to keep that with meson unless there's a
compelling reason not to.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 2/2] setup.py: fix out of tree build

[marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA]

From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Fixes: commit 1cc41b1c9 ("pylibfdt: Add packaging metadata")

Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 00444e64337b..029aa6182221 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ import sys
 
 srcdir = os.path.dirname(__file__)
 
-with open("README", "r") as fh:
+with open(os.path.join(srcdir, "README"), "r") as fh:
     long_description = fh.read()
 
 def get_top_builddir():
-- 
2.34.1.8.g35151cf07204

Re: [PATCH 2/2] setup.py: fix out of tree build

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

On Mon, Jan 03, 2022 at 11:38:55AM +0400, marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org wrote:
> From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> 
> Fixes: commit 1cc41b1c9 ("pylibfdt: Add packaging metadata")
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Applied, thanks.

> ---
>  setup.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/setup.py b/setup.py
> index 00444e64337b..029aa6182221 100755
> --- a/setup.py
> +++ b/setup.py
> @@ -17,7 +17,7 @@ import sys
>  
>  srcdir = os.path.dirname(__file__)
>  
> -with open("README", "r") as fh:
> +with open(os.path.join(srcdir, "README"), "r") as fh:
>      long_description = fh.read()
>  
>  def get_top_builddir():

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] setup.py: fix out of tree build

[Rob Herring]

On Mon, Jan 3, 2022 at 1:39 AM <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
> From: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

$subject is a non-feature IMO. Please see the my recent reply to your
patch from a year ago.

IMO, we should keep meson/Makefile and setup.py builds/tooling
separate. Each has their own ideas about how things work. The path
handling hacks that were in setup.py are just going to cause more
problems when we move to the new Python way with setup.cfg^W
pyproject.toml.

Rob
>
> Fixes: commit 1cc41b1c9 ("pylibfdt: Add packaging metadata")
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  setup.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/setup.py b/setup.py
> index 00444e64337b..029aa6182221 100755
> --- a/setup.py
> +++ b/setup.py
> @@ -17,7 +17,7 @@ import sys
>
>  srcdir = os.path.dirname(__file__)
>
> -with open("README", "r") as fh:
> +with open(os.path.join(srcdir, "README"), "r") as fh:
>      long_description = fh.read()
>
>  def get_top_builddir():
> --
> 2.34.1.8.g35151cf07204
>