| Message ID | 20211123193859.2983287-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | meson: drop redundant patch | expand |
Sorry, I have to say no. The offending is_debianlike function is still in place, and I would not want to battle cryptic errors again if it is taken in use somewhere else. The correct fix is to drop the function itself. Alex On Tue, 23 Nov 2021 at 20:39, Ross Burton <ross@burtonini.com> wrote: > This patch disables the debian-detection to use the correct $libdir by > default on that platform. However in cross builds this is always > overridden to be $prefix/lib, and all recipes that inherit meson pass > the correct libdir explicitly. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-devtools/meson/meson.inc | 1 - > ...01-is_debianlike-always-return-False.patch | 26 ------------------- > 2 files changed, 27 deletions(-) > delete mode 100644 > meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > > diff --git a/meta/recipes-devtools/meson/meson.inc > b/meta/recipes-devtools/meson/meson.inc > index f383ad9f74..757295a50a 100644 > --- a/meta/recipes-devtools/meson/meson.inc > +++ b/meta/recipes-devtools/meson/meson.inc > @@ -13,7 +13,6 @@ SRC_URI = " > https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P > file://disable-rpath-handling.patch \ > file://0001-Make-CPU-family-warnings-fatal.patch \ > file://0002-Support-building-allarch-recipes-again.patch \ > - file://0001-is_debianlike-always-return-False.patch \ > " > SRC_URI[sha256sum] = > "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13" > > diff --git > a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > deleted file mode 100644 > index 83c4782a61..0000000000 > --- > a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 667b9ede638677fb37911306937ea62f05897581 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Mon, 18 Oct 2021 15:55:59 +0200 > -Subject: [PATCH] is_debianlike(): always return False > - > -Otherwise, host contamination happens. > - > -Upstream-Status: Inappropriate [oe-core specific] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - mesonbuild/mesonlib/universal.py | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mesonbuild/mesonlib/universal.py > b/mesonbuild/mesonlib/universal.py > -index d670d04..47d1b52 100644 > ---- a/mesonbuild/mesonlib/universal.py > -+++ b/mesonbuild/mesonlib/universal.py > -@@ -651,7 +651,7 @@ def is_cygwin() -> bool: > - > - > - def is_debianlike() -> bool: > -- return os.path.isfile('/etc/debian_version') > -+ return False > - > - > - def is_dragonflybsd() -> bool: > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#158616): > https://lists.openembedded.org/g/openembedded-core/message/158616 > Mute This Topic: https://lists.openembedded.org/mt/87266402/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Tue, 2021-11-23 at 19:38 +0000, Ross Burton wrote: > This patch disables the debian-detection to use the correct $libdir by > default on that platform. However in cross builds this is always > overridden to be $prefix/lib, and all recipes that inherit meson pass > the correct libdir explicitly. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-devtools/meson/meson.inc | 1 - > ...01-is_debianlike-always-return-False.patch | 26 ------------------- > 2 files changed, 27 deletions(-) > delete mode 100644 meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch We build native things which are meson based. Do we want native tool libdir paths depending on the existence of /etc/debian_version ? It was some reason like that this was added as we found it doing 'fun' changes depending on the host. Not sure I really want to debug that again... Cheers, Richard
On Tue, 23 Nov 2021 at 22:36, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Tue, 2021-11-23 at 19:38 +0000, Ross Burton wrote: > > This patch disables the debian-detection to use the correct $libdir by > > default on that platform. However in cross builds this is always > > overridden to be $prefix/lib, and all recipes that inherit meson pass > > the correct libdir explicitly. > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > --- > > meta/recipes-devtools/meson/meson.inc | 1 - > > ...01-is_debianlike-always-return-False.patch | 26 ------------------- > > 2 files changed, 27 deletions(-) > > delete mode 100644 meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > > We build native things which are meson based. Do we want native tool libdir > paths depending on the existence of /etc/debian_version ? It was some reason > like that this was added as we found it doing 'fun' changes depending on the > host. Not sure I really want to debug that again... Sure, and they pass --libdir. I did a build of Sato and nothing moved, so I'm struggling to find the actual problem here. Ross
On Wed, 2021-11-24 at 10:17 +0000, Ross Burton wrote: > On Tue, 23 Nov 2021 at 22:36, Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: > > On Tue, 2021-11-23 at 19:38 +0000, Ross Burton wrote: > > > This patch disables the debian-detection to use the correct $libdir by > > > default on that platform. However in cross builds this is always > > > overridden to be $prefix/lib, and all recipes that inherit meson pass > > > the correct libdir explicitly. > > > > > > Signed-off-by: Ross Burton <ross.burton@arm.com> > > > --- > > > meta/recipes-devtools/meson/meson.inc | 1 - > > > ...01-is_debianlike-always-return-False.patch | 26 ------------------- > > > 2 files changed, 27 deletions(-) > > > delete mode 100644 meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch > > > > We build native things which are meson based. Do we want native tool libdir > > paths depending on the existence of /etc/debian_version ? It was some reason > > like that this was added as we found it doing 'fun' changes depending on the > > host. Not sure I really want to debug that again... > > Sure, and they pass --libdir. I did a build of Sato and nothing > moved, so I'm struggling to find the actual problem here. Did we start setting libdir for native builds after that change merged? I've spent half the last week chasing phantom issues so I'm just not feeling keen on doing it with yet another issue but I guess we can queue this and wait for something to break... Cheers, Richard
On Wed, 24 Nov 2021 at 11:20, Richard Purdie < richard.purdie@linuxfoundation.org> wrote: > > Sure, and they pass --libdir. I did a build of Sato and nothing > > moved, so I'm struggling to find the actual problem here. > > Did we start setting libdir for native builds after that change merged? > > I've spent half the last week chasing phantom issues so I'm just not > feeling > keen on doing it with yet another issue but I guess we can queue this and > wait > for something to break... > The actual problem was something entirely different and nothing to do with libdirs that was added in 0.59.2 and removed in 0.60.x: https://github.com/mesonbuild/meson/commit/142b741384347dd31ee2008726b3b3d237e2588f Once again, given that the offending is_debianlike() function is still in place and upstream may add more (broken) uses of it, I do not want this patch removed. Alex
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index f383ad9f74..757295a50a 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -13,7 +13,6 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://disable-rpath-handling.patch \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ - file://0001-is_debianlike-always-return-False.patch \ " SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13" diff --git a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch b/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch deleted file mode 100644 index 83c4782a61..0000000000 --- a/meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 667b9ede638677fb37911306937ea62f05897581 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Mon, 18 Oct 2021 15:55:59 +0200 -Subject: [PATCH] is_debianlike(): always return False - -Otherwise, host contamination happens. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - mesonbuild/mesonlib/universal.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py -index d670d04..47d1b52 100644 ---- a/mesonbuild/mesonlib/universal.py -+++ b/mesonbuild/mesonlib/universal.py -@@ -651,7 +651,7 @@ def is_cygwin() -> bool: - - - def is_debianlike() -> bool: -- return os.path.isfile('/etc/debian_version') -+ return False - - - def is_dragonflybsd() -> bool:
This patch disables the debian-detection to use the correct $libdir by default on that platform. However in cross builds this is always overridden to be $prefix/lib, and all recipes that inherit meson pass the correct libdir explicitly. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-devtools/meson/meson.inc | 1 - ...01-is_debianlike-always-return-False.patch | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0001-is_debianlike-always-return-False.patch