Skip to contentSkip to conversation

meson.bbclass: point to llvm-config

PATCH In review Anuj Mittal 5 participants 8 messages Feb 15, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 meson.bbclass: point to llvm-config

Allow packages using llvm-config to find it using meson's dependency interface.

---
 meta/classes/meson.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/meson.bbclass +1 -0
index dff0485b47..aaf873cad2 100644
@@ -89,6 +89,7 @@ ld = ${@meson_array('LD', d)}
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
+llvm-config = 'llvm-config8.0'
 
 [properties]
 needs_exe_wrapper = true
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 mesa: upgrade 18.1.9 -> 18.3.3

* For changes, see:
https://www.mesa3d.org/relnotes/18.3.3.html

* Convert from using autotools to meson and get rid of unnecessary patches.

* Include a patch to fix detection of host os combinations that we build for.

---
 ...0001-Simplify-wayland-scanner-lookup.patch | 39 ----------
 ...k-for-all-linux-host_os-combinations.patch | 49 +++++++++++++
 ...M-version-when-using-LLVM-Git-releas.patch | 44 ------------
 ...-Use-Python-3-to-execute-the-scripts.patch | 32 ---------
 ...-dri-i965-Add-missing-time.h-include.patch | 36 ----------
 ...R-for-defining-WAYLAND_PROTOCOLS_DAT.patch | 37 ----------
 .../{mesa-gl_18.1.9.bb => mesa-gl_18.3.3.bb}  |  0
 meta/recipes-graphics/mesa/mesa.inc           | 71 +++++++++----------
 .../mesa/{mesa_18.1.9.bb => mesa_18.3.3.bb}   | 10 +--
 9 files changed, 86 insertions(+), 232 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch
 create mode 100644 meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch
 rename meta/recipes-graphics/mesa/{mesa-gl_18.1.9.bb => mesa-gl_18.3.3.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_18.1.9.bb => mesa_18.3.3.bb} (54%)
meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch deleted +0 -39
deleted file mode 100644
index a50d2a2ba2..0000000000
@@ -1,39 +0,0 @@
-From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-Date: Tue, 15 Nov 2016 15:20:49 +0200
-Subject: [PATCH 1/6] Simplify wayland-scanner lookup
-Organization: O.S. Systems Software LTDA.
-
-Don't use pkg-config to lookup the path of a binary that's in the path.
-
-Alternatively we'd have to prefix the path returned by pkg-config with
-PKG_CONFIG_SYSROOT_DIR.
-
-Upstream-Status: Pending
-Signed-off-by: Jussi Kukkonen <[email protected]>
-Signed-off-by: Otavio Salvador <[email protected]>
----
- configure.ac | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 14f1af2b2f..916d0bd207 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1825,12 +1825,7 @@ for plat in $platforms; do
-         PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
-         WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
- 
--        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
--                          WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
--                          WAYLAND_SCANNER='')
--        if test "x$WAYLAND_SCANNER" = x; then
--            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
--        fi
-+        AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
- 
-         if test "x$WAYLAND_SCANNER" = "x:"; then
-                 AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform])
--- 
-2.18.0
-
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch new file +49 -0

49 lines not on this page · raw message

meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch deleted +0 -32
deleted file mode 100644
index 8953c4a18f..0000000000
@@ -1,32 +0,0 @@
-From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <[email protected]>
-Date: Fri, 29 Dec 2017 10:27:59 -0200
-Subject: [PATCH 4/6] Use Python 3 to execute the scripts
-Organization: O.S. Systems Software LTDA.
-
-The MESA build system uses Python 2 but as OE-Core has moved away from
-it, we change it to use Python 3 instead.
-
-Upstream-Status: Inappropriate [ configuration ]
-
-Signed-off-by: Otavio Salvador <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd172f1ebe..40cac36ac2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,7 +122,7 @@ AM_PROG_CC_C_O
- AC_PROG_NM
- AM_PROG_AS
- AX_CHECK_GNU_MAKE
--AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
-+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python])
- AC_PROG_SED
- AC_PROG_MKDIR_P
- 
--- 
-2.18.0
-
meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch deleted +0 -36
deleted file mode 100644
index d40e7b5855..0000000000
@@ -1,36 +0,0 @@
-From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <[email protected]>
-Date: Wed, 6 Jun 2018 09:50:35 -0300
-Subject: [PATCH 5/6] dri: i965: Add missing time.h include
-Organization: O.S. Systems Software LTDA.
-
-This fixes a build error when using musl:
-
-,----
-| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0:
-| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t'
-|     time_t free_time;
-|     ^~~~~~
-`----
-
-Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2]
-Signed-off-by: Otavio Salvador <[email protected]>
----
- src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
-index 68f5e0c2c8..5b60a23763 100644
---- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
-+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
-@@ -37,6 +37,7 @@
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
-+#include <time.h>
- #include "util/u_atomic.h"
- #include "util/list.h"
- 
--- 
-2.18.0
-
meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch deleted +0 -37
deleted file mode 100644
index 0212922c5d..0000000000
@@ -1,37 +0,0 @@
-From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <[email protected]>
-Date: Wed, 29 Aug 2018 22:10:30 -0300
-Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR
-Organization: O.S. Systems Software LTDA.
-
-This allows to override the wayland-protocols pkgdatadir with the
-WAYLAND_PROTOCOLS_DATADIR from environment.
-
-pkgconfig would return an absolute path in
-/usr/share/wayland-protocols
-for the pkgdatadir value, which is not suitable for cross-compiling.
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 40cac36ac2..728bbdcbc4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1823,7 +1823,7 @@ for plat in $platforms; do
-         PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
-         PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
-         PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
--        WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
-+        PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir)
- 
-         AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
- 
--- 
-2.18.0
-
meta/recipes-graphics/mesa/mesa-gl_18.3.3.bb renamed from meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb
rename to meta/recipes-graphics/mesa/mesa-gl_18.3.3.bb
meta/recipes-graphics/mesa/mesa.inc +34 -37

142 lines not on this page · raw message

meta/recipes-graphics/mesa/mesa_18.3.3.bb renamed from meta/recipes-graphics/mesa/mesa_18.1.9.bb +3 -7
similarity index 54%
rename from meta/recipes-graphics/mesa/mesa_18.1.9.bb
rename to meta/recipes-graphics/mesa/mesa_18.3.3.bb
index 86d6a6bf3a..2399cdd1ac 100644
@@ -1,16 +1,12 @@
 require ${BPN}.inc
 
 SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-Simplify-wayland-scanner-lookup.patch \
            file://0002-winsys-svga-drm-Include-sys-types.h.patch \
-           file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \
-           file://0004-Use-Python-3-to-execute-the-scripts.patch \
-           file://0005-dri-i965-Add-missing-time.h-include.patch \
-           file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \
+           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
 "
 
-SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a"
-SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83"
+SRC_URI[md5sum] = "e9d1a24dbd5ca20efa75b9a29eb4566f"
+SRC_URI[sha256sum] = "2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

Quoted 11 lines · Anuj Mittal

* For changes, see:
https://www.mesa3d.org/relnotes/18.3.3.html

* Convert from using autotools to meson and get rid of unnecessary patches.

* Include a patch to fix detection of host os combinations that we build
for.

This is good but I think you and Alex may need to work together to sort out mesa-native which fails after this patchset and is needed by the virtgl work (queued in -next).

https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/221

Cheers,

Richard

#3 lore raw

Re: [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

Quoted 10 lines · Richard Purdie
Quoted 10 lines

* For changes, see:
https://www.mesa3d.org/relnotes/18.3.3.html

* Convert from using autotools to meson and get rid of unnecessary patches.

* Include a patch to fix detection of host os combinations that we build
for.

Quoted 7 lines
Quoted 1 line

This is good but I think you and Alex may need to work together to sort out mesa-native which fails after this patchset and is needed by the virtgl work (queued in -next).

https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/221

Thanks, I'll take Anuj's patch and see what needs to be changed in it.

Alex

#4 lore raw

Re: [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

In reply to Anuj Mittal
Quoted 11 lines · Anuj Mittal

* For changes, see:
https://www.mesa3d.org/relnotes/18.3.3.html

* Convert from using autotools to meson and get rid of unnecessary patches.

* Include a patch to fix detection of host os combinations that we build for.

I think this patch should be split off. First we should upgrade to the newer release and later convert it to use meson.

This allows for better review and testing.

If desired, we can do the upgrade on our side and Anuj can handle the meson convertion, next. Does it make sense?

Signature · 3 lines
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
#5 lore raw

Re: [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

Quoted 7 lines · Otavio Salvador

I think this patch should be split off. First we should upgrade to the newer release and later convert it to use meson.

This allows for better review and testing.

If desired, we can do the upgrade on our side and Anuj can handle the meson convertion, next. Does it make sense?

Not really, in my opinion, it's just more friction and coordination, and delays. It's better to just fix the issues with the existing patch.
I'll send a fixed version in a few minutes.

Alex

#6 lore raw

Re: [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

Quoted 17 lines

-----Original Message-----
From: Alexander Kanavin [mailto:[email protected]]
Sent: Friday, February 15, 2019 08:52 PM
To: Otavio Salvador <[email protected]>
Cc: Mittal, Anuj <[email protected]>; Fabio Berton <[email protected]>; Patches and discussions about the oe-core layer <[email protected]>
Subject: Re: [OE-core] [PATCH 2/2] mesa: upgrade 18.1.9 -> 18.3.3

Quoted 3 lines · Otavio Salvador

I think this patch should be split off. First we should upgrade to the newer release and later convert it to use meson.

Quoted 9 lines
Quoted 4 lines

This allows for better review and testing.

If desired, we can do the upgrade on our side and Anuj can handle the meson convertion, next. Does it make sense?

Not really, in my opinion, it's just more friction and coordination, and delays. It's better to just fix the issues with the existing patch.
I'll send a fixed version in a few minutes.

Thanks Alex.

I didn’t want to spend time in refreshing patches in one commit and testing and making sure they were correct when some of them were going to be removed in next. So I took this approach.

Thanks,
Anuj

#7 lore raw
In reply to Anuj Mittal
Quoted 14 lines · Anuj Mittal

Allow packages using llvm-config to find it using meson's dependency interface.

---
 meta/classes/meson.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/meson.bbclass +0 -0
index dff0485b47..aaf873cad2 100644

meta/classes/meson.bbclass ld = ${@meson_array('LD', d)} · line 93

Quoted 5 lines
meta/classes/meson.bbclass +1 -0
@@ -89,6 +89,7 @@ ld = ${@meson_array('LD', d)}
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
+llvm-config = 'llvm-config8.0'
 

i think llvm should install a symlink from llvm-config otherwise we will need to change this everytime we upgrade llvm tonew major version

Quoted 10 lines
meta/classes/meson.bbclass +0 -1
 [properties]
 needs_exe_wrapper = true
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core