libdrm: change to meson build system
PATCH v7 1/1 libdrm: change to meson build system
- remove legacy patch 0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
- add patch to fix meson atomic ops detection 0003-meson.build-fix-intel-atomics-detection.patch
- add patch to enable static build
0004-meson.build-enable-static-build.patch
---
Notes:
- convertion from "LIBDRM_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'" is missing (maybe meson gets it right (?) or use LIBDRM_CFLAGS to force it)
Changes v6 -> v7:
- adjusted to Yann E. MORIN latest version of 'infra/pkg-meson: allow packages to pass custom compiler/linker flags'
http://lists.busybox.net/pipermail/buildroot/2019-June/253418.html
Changes v5 -> v6:
- no changes
Changes v4 -> v5:
- fix sparc LIBDRM_MESON_CFLAGS, remove extra quotation marks and comma
Changes v3 -> v4:
- rebased on current master (suggested by Thomas Petazzoni)
Changes v2 -> v3:
- fix 0003-meson.build-fix-intel-atomics-detection.patch (linking needs main)
- add 0004-meson.build-enable-static-build.patch to enable static compile
Changes v1 -> v2:
- add 0003-meson.build-fix-intel-atomics-detection.patch to fix sparc compile
--- ...le.am-use-pkg-config-to-discover-lib.patch | 162 ----------------- ...on.build-fix-intel-atomics-detection.patch | 35 ++++ ...0004-meson.build-enable-static-build.patch | 169 ++++++++++++++++++ package/libdrm/libdrm.mk | 71 ++++---- 4 files changed, 236 insertions(+), 201 deletions(-) delete mode 100644 package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch create mode 100644 package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch create mode 100644 package/libdrm/0004-meson.build-enable-static-build.patch
package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch deleted +0 -162
@@ -1,162 +0,0 @@ -From 57d544ff2f96a26cac07d5be00ff7b67678ae7b8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Mon, 18 Dec 2017 13:08:39 +0100 -Subject: [PATCH] configure/Makefile.am: use pkg-config to discover - libatomic_ops - -The configure script currently tests the availability of libatomic_ops -by checking the presence of atomic_ops.h. While this is good enough as -an availability test, it is not sufficient as on some platforms, -libatomic_ops provides an actual shared library against which we -should be linked to access libatomic_ops functionality. - -Therefore, we instead use PKG_CHECK_MODULES() to test the availability -of libatomic_ops. Besides testing its availability, this also fills in -the ATOMIC_OPS_LIBS variable with the list of libraries we need to -link with to use libatomic_ops. - -All Mesa drivers that include xf86atomic.h have been updated to link -against ATOMIC_OPS_LIBS. - -Of course, if we're not using libatomic_ops, ATOMIC_OPS_LIBS is empty, -and we don't link against it. - -Signed-off-by: Thomas Petazzoni <[email protected]> -Signed-off-by: Peter Seiderer <[email protected]> -[Bernd: PKG_CHECK_MODULES should not fail when libatomic_ops is missing] -Signed-off-by: Bernd Kuhls <[email protected]> ---- - amdgpu/Makefile.am | 2 +- - configure.ac | 2 +- - etnaviv/Makefile.am | 3 ++- - freedreno/Makefile.am | 3 ++- - intel/Makefile.am | 3 ++- - nouveau/Makefile.am | 2 +- - omap/Makefile.am | 2 +- - radeon/Makefile.am | 2 +- - tegra/Makefile.am | 2 +- - 9 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am -index a1b0d05c..b2bcceff 100644 ---- a/amdgpu/Makefile.am -+++ b/amdgpu/Makefile.am -@@ -36,7 +36,7 @@ AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\" - libdrm_amdgpu_la_LTLIBRARIES = libdrm_amdgpu.la - libdrm_amdgpu_ladir = $(libdir) - libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES) - amdgpu_asic_id.lo: $(top_srcdir)/data/amdgpu.ids -diff --git a/configure.ac b/configure.ac -index 35378b33..501d0871 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -247,7 +247,7 @@ AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives, [ - ]],[[]])], [drm_cv_atomic_primitives="Intel"],[]) - - if test "x$drm_cv_atomic_primitives" = "xnone"; then -- AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops") -+ PKG_CHECK_MODULES(ATOMIC_OPS, [atomic_ops], drm_cv_atomic_primitives="libatomic-ops", true) - fi - - # atomic functions defined in <atomic.h> & libc on Solaris -diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am -index be96ba86..669cf14f 100644 ---- a/etnaviv/Makefile.am -+++ b/etnaviv/Makefile.am -@@ -12,7 +12,8 @@ libdrm_etnaviv_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_etnaviv_la_LIBADD = \ - ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_etnaviv_la_SOURCES = $(LIBDRM_ETNAVIV_FILES) - -diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am -index cbb0d031..238407e3 100644 ---- a/freedreno/Makefile.am -+++ b/freedreno/Makefile.am -@@ -14,7 +14,8 @@ libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_freedreno_la_LIBADD = \ - ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) - if HAVE_FREEDRENO_KGSL -diff --git a/intel/Makefile.am b/intel/Makefile.am -index c52e8c08..f3635a64 100644 ---- a/intel/Makefile.am -+++ b/intel/Makefile.am -@@ -38,7 +38,8 @@ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ -- @CLOCK_LIB@ -+ @CLOCK_LIB@ \ -+ @ATOMIC_OPS_LIBS@ - - libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES) - -diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am -index 344a8445..a4e6a78b 100644 ---- a/nouveau/Makefile.am -+++ b/nouveau/Makefile.am -@@ -10,7 +10,7 @@ AM_CFLAGS = \ - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES) - -diff --git a/omap/Makefile.am b/omap/Makefile.am -index 599bb9de..524afee3 100644 ---- a/omap/Makefile.am -+++ b/omap/Makefile.am -@@ -7,7 +7,7 @@ AM_CFLAGS = \ - libdrm_omap_la_LTLIBRARIES = libdrm_omap.la - libdrm_omap_ladir = $(libdir) - libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_omap_la_SOURCES = omap_drm.c - -diff --git a/radeon/Makefile.am b/radeon/Makefile.am -index e2415314..c27d3c75 100644 ---- a/radeon/Makefile.am -+++ b/radeon/Makefile.am -@@ -33,7 +33,7 @@ AM_CFLAGS = \ - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES) - -diff --git a/tegra/Makefile.am b/tegra/Makefile.am -index fb40be55..12abe8c4 100644 ---- a/tegra/Makefile.am -+++ b/tegra/Makefile.am -@@ -9,7 +9,7 @@ AM_CFLAGS = \ - libdrm_tegra_ladir = $(libdir) - libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la - libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined --libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@ - - libdrm_tegra_la_SOURCES = \ - private.h \ --- -2.14.3 -
package/libdrm/0003-meson.build-fix-intel-atomics-detection.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 00f6ac3c24f36fa07fa93f4a89ee873edf125098 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Mon, 16 Jul 2018 23:01:40 +0200 +Subject: [PATCH] meson.build: fix intel atomics detection + +Use the stronger compiler.link() test (instead of the weaker +compiler.compile()) to fix the intel atomics detection. + +Fixes false positive in case of sparc compile (buildroot toolchain). + +Upstream suggested: https://lists.freedesktop.org/archives/dri-devel/2018-July/183885.html +Signed-off-by: Peter Seiderer <[email protected]> +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9b443a5..3c8afb6 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,9 +49,10 @@ intel_atomics = false + lib_atomics = false + + dep_atomic_ops = dependency('atomic_ops', required : false) +-if cc.compiles(''' ++if cc.links(''' + int atomic_add(int *i) { return __sync_add_and_fetch (i, 1); } + int atomic_cmpxchg(int *i, int j, int k) { return __sync_val_compare_and_swap (i, j, k); } ++ int main() { } + ''', + name : 'Intel Atomics') + intel_atomics = true +-- +2.18.0 +
package/libdrm/0004-meson.build-enable-static-build.patch new file +169 -0
169 lines not on this page · raw message
package/libdrm/libdrm.mk +32 -39
146 lines not on this page · raw message
--
2.21.0
PATCH v7 1/1 libdrm: change to meson build system
Quoted 9 lines · On Tue, 25 Jun 2019 22:11:27 +0200 Peter Seiderer <[email protected]> wrote:
- remove legacy patch 0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
- add patch to fix meson atomic ops detection 0003-meson.build-fix-intel-atomics-detection.patch
- add patch to enable static build
0004-meson.build-enable-static-build.patch
Quoted 6 lines
Signed-off-by Peter Seiderer <[email protected]>---
Notes:
- convertion from "LIBDRM_CONF_ENV= ac_cv_prog_cc_c99='-std=gnu99'" is missing (maybe meson gets it right (?) or useLIBDRM_CFLAGSto force it)
Applied to master, thanks. However, there is already one build failure, I'm not sure if it's directly related to the meson change:
http://autobuild.buildroot.net/results/d15/d15ed604756cac4e4a87afca61b7a4778f293baf/build-end.log
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v7 1/1 libdrm: change to meson build system
On Sun, 4 Aug 2019 10:28:07 +0200, Thomas Petazzoni <[email protected]> wrote:
Hello Thomas,
Quoted 19 lines
Quoted 9 lines · On Tue, 25 Jun 2019 22:11:27 +0200 Peter Seiderer <[email protected]> wrote:
- remove legacy patch 0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
- add patch to fix meson atomic ops detection 0003-meson.build-fix-intel-atomics-detection.patch
- add patch to enable static build
0004-meson.build-enable-static-build.patchQuoted 6 lines
Signed-off-by Peter Seiderer <[email protected]>---
Notes:
- convertion from "LIBDRM_CONF_ENV= ac_cv_prog_cc_c99='-std=gnu99'" is missing (maybe meson gets it right (?) or useLIBDRM_CFLAGSto force it)
Quoted 4 lines
Applied to master, thanks. However, there is already one build failure, I'm not sure if it's directly related to the meson change:
http://autobuild.buildroot.net/results/d15/d15ed604756cac4e4a87afca61b7a4778f293baf/build-end.log
Ups, known issue ;-) and reminds me of an old (but not yet ready for submission) patch in my git repository fixing the issue, draft submitted ([1]) just now...
Updated version (with proper commit log, autobuild referecen etc.) will follow...
Regards,
Peter
[1] https://patchwork.ozlabs.org/patch/1141849/
Quoted 4 lines
Best regards,
Thomas