[PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Fabio Berton]

From: Otavio Salvador <otavio@ossystems.com.br>

This is a bugfix only set of releases. Check following links for the
relevant release notes:

  - https://www.mesa3d.org/relnotes/19.1.2.html
  - https://www.mesa3d.org/relnotes/19.1.3.html
  - https://www.mesa3d.org/relnotes/19.1.4.html
  - https://www.mesa3d.org/relnotes/19.1.5.html
  - https://www.mesa3d.org/relnotes/19.1.6.html

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 ...k-for-all-linux-host_os-combinations.patch | 37 ++++++---------
 ...on.build-make-TLS-GLX-optional-again.patch | 12 ++---
 ...Allow-enable-DRI-without-DRI-drivers.patch | 10 ++--
 ...rove-detection-of-Python-when-using-.patch | 46 +++++++++++++++++++
 .../{mesa-gl_19.1.1.bb => mesa-gl_19.1.6.bb}  |  0
 .../mesa/{mesa_19.1.1.bb => mesa_19.1.6.bb}   |  5 +-
 6 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/files/0004-Revert-meson-Improve-detection-of-Python-when-using-.patch
 rename meta/recipes-graphics/mesa/{mesa-gl_19.1.1.bb => mesa-gl_19.1.6.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_19.1.1.bb => mesa_19.1.6.bb} (78%)

diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 0064dc643c..9fba5da4b2 100644
--- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,7 +1,7 @@
-From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001
+From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001
 From: Fabio Berton <fabio.berton@ossystems.com.br>
 Date: Wed, 12 Jun 2019 13:40:20 -0300
-Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations
+Subject: [PATCH] meson.build: check for all linux host_os combinations
 Organization: O.S. Systems Software LTDA.
 
 Make sure that we are also looking for our host_os combinations like
@@ -13,41 +13,30 @@ Upstream-Status: Pending
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 ---
- meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 8ab8a550f56..e11880f2902 100644
+index 567a81afd6f..b33b430aed4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp')
- 
- null_dep = dependency('', required : false)
- 
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')
-+
- # Arguments for the preprocessor, put these in a separate array from the C and
- # C++ (cpp in meson terminology) arguments since they need to be added to the
- # default arguments for both C and C++.
-@@ -107,8 +109,6 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
  # Only build shared_glapi if at least one OpenGL API is enabled
  with_shared_glapi = get_option('shared-glapi') and with_any_opengl
  
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system())
--
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')
+ 
  dri_drivers = get_option('dri-drivers')
  if dri_drivers.contains('auto')
-   if system_has_kms_drm
-@@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));',
+@@ -845,7 +845,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));',
  endif
  
  # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
-+if ['cygwin', 'gnu'].contains(host_machine.system()) or host_machine.system().startswith('linux')
+-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
++if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux')
    pre_args += '-D_GNU_SOURCE'
  endif
  
--- 
-2.22.0
-
diff --git a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
index 81454aaa29..641bacf1d9 100644
--- a/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
+++ b/meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-GLX-optional-again.patch
@@ -1,7 +1,7 @@
-From d31718999797ffc4dd177d14760ef7b8fd95ac2f Mon Sep 17 00:00:00 2001
+From cee8e48c5344124e5d84307cb0c48ee0c9b3e684 Mon Sep 17 00:00:00 2001
 From: Fabio Berton <fabio.berton@ossystems.com.br>
 Date: Wed, 12 Jun 2019 14:15:57 -0300
-Subject: [PATCH 2/3] meson.build: make TLS GLX optional again
+Subject: [PATCH] meson.build: make TLS GLX optional again
 Organization: O.S. Systems Software LTDA.
 
 This was optional with autotools, and needs to be disabled
@@ -11,16 +11,17 @@ Upstream-Status: Pending
 
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 ---
  meson.build       | 4 +++-
  meson_options.txt | 7 +++++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index e11880f2902..7a07974ba61 100644
+index b33b430aed4..0e50bb26c0a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -362,7 +362,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
+@@ -369,7 +369,9 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
    endif
  endif
  
@@ -49,6 +50,3 @@ index 1f72faabee8..fcd49efea27 100644
  option(
    'I-love-half-baked-turnips',
    type : 'boolean',
--- 
-2.22.0
-
diff --git a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 0f254a1d91..3458c19199 100644
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -1,20 +1,21 @@
-From 417ff3a03313aa003244990ed5c0188c421e6181 Mon Sep 17 00:00:00 2001
+From f1482e88c2295b9c7288f5b273335a8e18039de8 Mon Sep 17 00:00:00 2001
 From: Fabio Berton <fabio.berton@ossystems.com.br>
 Date: Wed, 12 Jun 2019 14:18:31 -0300
-Subject: [PATCH 3/3] Allow enable DRI without DRI drivers
+Subject: [PATCH] Allow enable DRI without DRI drivers
 Organization: O.S. Systems Software LTDA.
 
 Upstream-Status: Pending
 
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 ---
  meson.build       | 2 +-
  meson_options.txt | 6 ++++++
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 7a07974ba61..5c7cbe38376 100644
+index 0e50bb26c0a..de065c290d6 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -137,7 +137,7 @@ with_dri_r200 = dri_drivers.contains('r200')
@@ -43,6 +44,3 @@ index fcd49efea27..0529200b3bb 100644
  option(
    'dri-drivers',
    type : 'array',
--- 
-2.22.0
-
diff --git a/meta/recipes-graphics/mesa/files/0004-Revert-meson-Improve-detection-of-Python-when-using-.patch b/meta/recipes-graphics/mesa/files/0004-Revert-meson-Improve-detection-of-Python-when-using-.patch
new file mode 100644
index 0000000000..8e42aa50e4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0004-Revert-meson-Improve-detection-of-Python-when-using-.patch
@@ -0,0 +1,46 @@
+From 7f1e017ec15fd1fbe91a56770739117bfdeec266 Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Sat, 17 Aug 2019 11:15:38 -0300
+Subject: [PATCH] Revert "meson: Improve detection of Python when using Meson
+ >=0.50."
+Organization: O.S. Systems Software LTDA.
+
+This reverts commit cb3072488cd327155206e92d1ad8eb72a23ab04e.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+This change need to be fix upstream. As a workaround revert this
+commit to prevent blocking update mesa recipe.
+
+Without this we get this error:
+
+/-----------------------------------------------------------------------
+|meson.build:765:2: ERROR: <ExternalProgram 'python3' ->
+|['../build/tmp/work/cortexa9hf-neon-imx-oel-linux-gnueabi/
+|mesa/2_19.1.6-r0/recipe-sysroot-native/usr/bin/python3-native/python3']>
+|is not a valid python or it is missing setuptools
+\-----------------------------------------------------------------------
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index de065c290d6..88c74c2c715 100644
+--- a/meson.build
++++ b/meson.build
+@@ -761,11 +761,7 @@ if with_platform_haiku
+   pre_args += '-DHAVE_HAIKU_PLATFORM'
+ endif
+ 
+-if meson.version().version_compare('>=0.50')
+-  prog_python = import('python').find_installation('python3')
+-else
+-  prog_python = import('python3').find_python()
+-endif
++prog_python = import('python3').find_python()
+ has_mako = run_command(
+   prog_python, '-c',
+   '''
diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_19.1.1.bb
rename to meta/recipes-graphics/mesa/mesa-gl_19.1.6.bb
diff --git a/meta/recipes-graphics/mesa/mesa_19.1.1.bb b/meta/recipes-graphics/mesa/mesa_19.1.6.bb
similarity index 78%
rename from meta/recipes-graphics/mesa/mesa_19.1.1.bb
rename to meta/recipes-graphics/mesa/mesa_19.1.6.bb
index 1d5d00f73e..f356d8109c 100644
--- a/meta/recipes-graphics/mesa/mesa_19.1.1.bb
+++ b/meta/recipes-graphics/mesa/mesa_19.1.6.bb
@@ -4,10 +4,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0002-meson.build-make-TLS-GLX-optional-again.patch \
            file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
+           file://0004-Revert-meson-Improve-detection-of-Python-when-using-.patch \
            "
 
-SRC_URI[md5sum] = "07cd8cd79de28ec1a374ee3a06e47789"
-SRC_URI[sha256sum] = "72114b16b4a84373b2acda060fe2bb1d45ea2598efab3ef2d44bdeda74f15581"
+SRC_URI[md5sum] = "7dbb40b8d10e89bee0a5bfc85350647b"
+SRC_URI[sha256sum] = "2a369b7b48545c6486e7e44913ad022daca097c8bd937bf30dcf3f17a94d3496"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
-- 
2.20.1

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

On Fri, 6 Sep 2019 at 20:47, Fabio Berton <fabio.berton@ossystems.com.br>
wrote:

> +Subject: [PATCH] Revert "meson: Improve detection of Python when using
> Meson
> + >=0.50."
> +Organization: O.S. Systems Software LTDA.
> +
> +This reverts commit cb3072488cd327155206e92d1ad8eb72a23ab04e.
> +
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +This change need to be fix upstream. As a workaround revert this
> +commit to prevent blocking update mesa recipe.
> +
> +Without this we get this error:
> +
> +/-----------------------------------------------------------------------
> +|meson.build:765:2: ERROR: <ExternalProgram 'python3' ->
> +|['../build/tmp/work/cortexa9hf-neon-imx-oel-linux-gnueabi/
> +|mesa/2_19.1.6-r0/recipe-sysroot-native/usr/bin/python3-native/python3']>
> +|is not a valid python or it is missing setuptools
> +\-----------------------------------------------------------------------
>

As I had previously suggested... can you try adding 'python3' to DEPENDS of
mesa, and see if that helps please? I think that would allow avoiding this
patch altogether.

Alex

[-- Attachment #2: Type: text/html, Size: 1571 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Otavio Salvador]

Hello Alexander,

On Fri, Sep 6, 2019 at 4:08 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> On Fri, 6 Sep 2019 at 20:47, Fabio Berton <fabio.berton@ossystems.com.br> wrote:
>> +Subject: [PATCH] Revert "meson: Improve detection of Python when using Meson
>> + >=0.50."
>> +Organization: O.S. Systems Software LTDA.
>> +
>> +This reverts commit cb3072488cd327155206e92d1ad8eb72a23ab04e.
>> +
>> +Upstream-Status: Inappropriate [embedded specific]
>> +
>> +This change need to be fix upstream. As a workaround revert this
>> +commit to prevent blocking update mesa recipe.
>> +
>> +Without this we get this error:
>> +
>> +/-----------------------------------------------------------------------
>> +|meson.build:765:2: ERROR: <ExternalProgram 'python3' ->
>> +|['../build/tmp/work/cortexa9hf-neon-imx-oel-linux-gnueabi/
>> +|mesa/2_19.1.6-r0/recipe-sysroot-native/usr/bin/python3-native/python3']>
>> +|is not a valid python or it is missing setuptools
>> +\-----------------------------------------------------------------------
>
> As I had previously suggested... can you try adding 'python3' to DEPENDS of mesa, and see if that helps please? I think that would allow avoiding this patch altogether.

Why a new build dependency if this works just fine?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

> > As I had previously suggested... can you try adding 'python3' to DEPENDS
> of mesa, and see if that helps please? I think that would allow avoiding
> this patch altogether.
>
> Why a new build dependency if this works just fine?
>

1. Less patches is always better than more patches, especially if they are
non-upstreamable.

2. The patch reverts to something that meson has deprecated and will likely
remove in the future.
https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md

3. Meson's currently supported way of detecting python does in fact rely on
python's target configuration being available, as it picks up settings from
it. I had fixed a similar issue elsewhere recently.

Alex

[-- Attachment #2: Type: text/html, Size: 1318 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Fabio Berton]

Hi Alexander!

I sent a v2 with python3 in depends and dropped the patch.

Thanks!

On Fri, Sep 6, 2019 at 5:33 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>
> On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <otavio.salvador@ossystems.com.br> wrote:
>>
>> > As I had previously suggested... can you try adding 'python3' to DEPENDS of mesa, and see if that helps please? I think that would allow avoiding this patch altogether.
>>
>> Why a new build dependency if this works just fine?
>
>
> 1. Less patches is always better than more patches, especially if they are non-upstreamable.
>
> 2. The patch reverts to something that meson has deprecated and will likely remove in the future.
> https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md
>
> 3. Meson's currently supported way of detecting python does in fact rely on python's target configuration being available, as it picks up settings from it. I had fixed a similar issue elsewhere recently.
>
> Alex
>

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

Thanks, now it's future-proof :)

Alex

On Mon, 9 Sep 2019 at 16:54, Fabio Berton <fabio.berton@ossystems.com.br>
wrote:

> Hi Alexander!
>
> I sent a v2 with python3 in depends and dropped the patch.
>
> Thanks!
>
> On Fri, Sep 6, 2019 at 5:33 PM Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> >
> > On Fri, 6 Sep 2019 at 22:12, Otavio Salvador <
> otavio.salvador@ossystems.com.br> wrote:
> >>
> >> > As I had previously suggested... can you try adding 'python3' to
> DEPENDS of mesa, and see if that helps please? I think that would allow
> avoiding this patch altogether.
> >>
> >> Why a new build dependency if this works just fine?
> >
> >
> > 1. Less patches is always better than more patches, especially if they
> are non-upstreamable.
> >
> > 2. The patch reverts to something that meson has deprecated and will
> likely remove in the future.
> >
> https://github.com/mesonbuild/meson/blob/master/docs/markdown/Python-3-module.md
> >
> > 3. Meson's currently supported way of detecting python does in fact rely
> on python's target configuration being available, as it picks up settings
> from it. I had fixed a similar issue elsewhere recently.
> >
> > Alex
> >
>

[-- Attachment #2: Type: text/html, Size: 1920 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Ross Burton]

On 06/09/2019 20:07, Alexander Kanavin wrote:
> As I had previously suggested... can you try adding 'python3' to DEPENDS 
> of mesa, and see if that helps please? I think that would allow avoiding 
> this patch altogether.

So why does Meson need *target* Python to be present when building Mesa?

Ross

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

On Mon, 9 Sep 2019 at 18:49, Ross Burton <ross.burton@intel.com> wrote:

> > As I had previously suggested... can you try adding 'python3' to DEPENDS
> > of mesa, and see if that helps please? I think that would allow avoiding
> > this patch altogether.
>
> So why does Meson need *target* Python to be present when building Mesa?
>

Because mesa does this:

prog_python = import('python').find_installation('python3')

and find_installation() method of meson does not merely look for the native
python binary, it runs the binary with a meson-supplied python script
designed to obtain all sorts of information, including target-specific
things that we patch native python to report. If the target python
installation is not present in sysroot, the script will fail, and meson
will declare that 'there is no valid installation of python on your system'.

Alex

[-- Attachment #2: Type: text/html, Size: 1318 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Ross Burton]

On 09/09/2019 19:41, Alexander Kanavin wrote:
> and find_installation() method of meson does not merely look for the 
> native python binary, it runs the binary with a meson-supplied python 
> script designed to obtain all sorts of information, including 
> target-specific things that we patch native python to report. If the 
> target python installation is not present in sysroot, the script will 
> fail, and meson will declare that 'there is no valid installation of 
> python on your system'.

So the python3-native pokes around the target python3 to get the right 
values?

Ross

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

On Tue, 10 Sep 2019 at 11:50, Ross Burton <ross.burton@intel.com> wrote:

> On 09/09/2019 19:41, Alexander Kanavin wrote:
> > and find_installation() method of meson does not merely look for the
> > native python binary, it runs the binary with a meson-supplied python
> > script designed to obtain all sorts of information, including
> > target-specific things that we patch native python to report. If the
> > target python installation is not present in sysroot, the script will
> > fail, and meson will declare that 'there is no valid installation of
> > python on your system'.
>
> So the python3-native pokes around the target python3 to get the right
> values?
>

Yes, if STAGING_LIBDIR is set, via this patch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch

(don't shoot the pianist, it was working like this pre-rewrite as well).

Alex

[-- Attachment #2: Type: text/html, Size: 1603 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Fabio Berton]

Adding python3-native doesn't work.

Hmm... it seems that adding "export STAGING_LIBDIR =
"${STAGING_LIBDIR_NATIVE}"" and removing python3 from DEPENDS worked.

Alexander, I don't know what is the best way to do this, maybe you can
help here.

Thanks!

On Tue, Sep 10, 2019 at 7:40 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> On Tue, 10 Sep 2019 at 11:50, Ross Burton <ross.burton@intel.com> wrote:
>>
>> On 09/09/2019 19:41, Alexander Kanavin wrote:
>> > and find_installation() method of meson does not merely look for the
>> > native python binary, it runs the binary with a meson-supplied python
>> > script designed to obtain all sorts of information, including
>> > target-specific things that we patch native python to report. If the
>> > target python installation is not present in sysroot, the script will
>> > fail, and meson will declare that 'there is no valid installation of
>> > python on your system'.
>>
>> So the python3-native pokes around the target python3 to get the right
>> values?
>
>
> Yes, if STAGING_LIBDIR is set, via this patch:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
>
> (don't shoot the pianist, it was working like this pre-rewrite as well).
>
> Alex
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

The best way is like in your latest patch - inherit python3native and
DEPENDS = "python3". No need for further tweaks, why did you try them?

Alex

On Tue, 10 Sep 2019 at 15:59, Fabio Berton <fabio.berton@ossystems.com.br>
wrote:

> Adding python3-native doesn't work.
>
> Hmm... it seems that adding "export STAGING_LIBDIR =
> "${STAGING_LIBDIR_NATIVE}"" and removing python3 from DEPENDS worked.
>
> Alexander, I don't know what is the best way to do this, maybe you can
> help here.
>
> Thanks!
>
> On Tue, Sep 10, 2019 at 7:40 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > On Tue, 10 Sep 2019 at 11:50, Ross Burton <ross.burton@intel.com> wrote:
> >>
> >> On 09/09/2019 19:41, Alexander Kanavin wrote:
> >> > and find_installation() method of meson does not merely look for the
> >> > native python binary, it runs the binary with a meson-supplied python
> >> > script designed to obtain all sorts of information, including
> >> > target-specific things that we patch native python to report. If the
> >> > target python installation is not present in sysroot, the script will
> >> > fail, and meson will declare that 'there is no valid installation of
> >> > python on your system'.
> >>
> >> So the python3-native pokes around the target python3 to get the right
> >> values?
> >
> >
> > Yes, if STAGING_LIBDIR is set, via this patch:
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
> >
> > (don't shoot the pianist, it was working like this pre-rewrite as well).
> >
> > Alex
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2975 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Fabio Berton]

Because I was a little confused about find_installation() function,
but your comment above clarifies.

Thanks!

On Tue, Sep 10, 2019 at 11:24 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> The best way is like in your latest patch - inherit python3native and DEPENDS = "python3". No need for further tweaks, why did you try them?
>
> Alex
>
> On Tue, 10 Sep 2019 at 15:59, Fabio Berton <fabio.berton@ossystems.com.br> wrote:
>>
>> Adding python3-native doesn't work.
>>
>> Hmm... it seems that adding "export STAGING_LIBDIR =
>> "${STAGING_LIBDIR_NATIVE}"" and removing python3 from DEPENDS worked.
>>
>> Alexander, I don't know what is the best way to do this, maybe you can
>> help here.
>>
>> Thanks!
>>
>> On Tue, Sep 10, 2019 at 7:40 AM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>> >
>> > On Tue, 10 Sep 2019 at 11:50, Ross Burton <ross.burton@intel.com> wrote:
>> >>
>> >> On 09/09/2019 19:41, Alexander Kanavin wrote:
>> >> > and find_installation() method of meson does not merely look for the
>> >> > native python binary, it runs the binary with a meson-supplied python
>> >> > script designed to obtain all sorts of information, including
>> >> > target-specific things that we patch native python to report. If the
>> >> > target python installation is not present in sysroot, the script will
>> >> > fail, and meson will declare that 'there is no valid installation of
>> >> > python on your system'.
>> >>
>> >> So the python3-native pokes around the target python3 to get the right
>> >> values?
>> >
>> >
>> > Yes, if STAGING_LIBDIR is set, via this patch:
>> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
>> >
>> > (don't shoot the pianist, it was working like this pre-rewrite as well).
>> >
>> > Alex
>> > --
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Ross Burton]

On 10/09/2019 11:39, Alexander Kanavin wrote:
> Yes, if STAGING_LIBDIR is set, via this patch:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
> 
> (don't shoot the pianist, it was working like this pre-rewrite as well).

See I knew that but had blocked it out because it's so horrible.

One day we need to sit down with upstream Python and figure out how to 
handle cross-compilation properly.

I finally managed to make my own builds fail (had to turn off Python in 
libxml2) and beat at it to build without a target Python.  Fabio: can 
you try building Mesa with these two patches:

http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=5f3559d8bb61212e0f9a6543f2dce2bdf77c48b5
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=4f8995aaa2ec557a0603ddc664d929317b0c0b6e

Cheers,
Ross

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Alexander Kanavin]

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

On Wed, 11 Sep 2019 at 14:35, Ross Burton <ross.burton@intel.com> wrote:

>
> See I knew that but had blocked it out because it's so horrible.
>
> One day we need to sit down with upstream Python and figure out how to
> handle cross-compilation properly.
>
> I finally managed to make my own builds fail (had to turn off Python in
> libxml2) and beat at it to build without a target Python.  Fabio: can
> you try building Mesa with these two patches:
>
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=5f3559d8bb61212e0f9a6543f2dce2bdf77c48b5
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=4f8995aaa2ec557a0603ddc664d929317b0c0b6e
>

I have to say, the latter patch is rather ugly. It would be better to split
python3native class into two: python3native (just for running scripts, does
not depend on target python3), and python3target (for actually obtaining
information about the target configuration, does need target python3).
Until then, I'd just pull in target python, for simplicity's sake (also
there's one or two recipes where the same meson problem happens).

Alex

[-- Attachment #2: Type: text/html, Size: 1830 bytes --]

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Ross Burton]

On 11/09/2019 16:27, Alexander Kanavin wrote:
> I have to say, the latter patch is rather ugly. It would be better to 
> split python3native class into two: python3native (just for running 
> scripts, does not depend on target python3), and python3target (for 
> actually obtaining information about the target configuration, does need 
> target python3). Until then, I'd just pull in target python, for 
> simplicity's sake (also there's one or two recipes where the same meson 
> problem happens).

Oh yes, the patch isn't pretty.

I was wondering how many recipes actually need the ability to run 
nativepython getting information about target python.  Splitting the 
class, or having a toggle, was an idea I had too.

Ross

Re: [PATCH] mesa: Upgrade 19.1.1 -> 19.1.6

[Fabio Berton]

Hi Ross!

On Wed, Sep 11, 2019 at 9:35 AM Ross Burton <ross.burton@intel.com> wrote:
>
> On 10/09/2019 11:39, Alexander Kanavin wrote:
> > Yes, if STAGING_LIBDIR is set, via this patch:
> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch
> >
> > (don't shoot the pianist, it was working like this pre-rewrite as well).
>
> See I knew that but had blocked it out because it's so horrible.
>
> One day we need to sit down with upstream Python and figure out how to
> handle cross-compilation properly.
>
> I finally managed to make my own builds fail (had to turn off Python in
> libxml2) and beat at it to build without a target Python.  Fabio: can
> you try building Mesa with these two patches:

Worked removing python3 from DEPENDS and adding these two patches.

Fabio
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=5f3559d8bb61212e0f9a6543f2dce2bdf77c48b5
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=ross/mut&id=4f8995aaa2ec557a0603ddc664d929317b0c0b6e
>
> Cheers,
> Ross