[packages/libdrm] - disable valgrind by default to avoid libdrm_intel.pc cflags poisoning (-I/usr/include/valgrind b

qboosh qboosh at pld-linux.org
Tue May 5 20:36:40 CEST 2020


commit 86ed43cb55c12ee283648eb743ed78b51ba4411f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 5 20:36:53 2020 +0200

    - disable valgrind by default to avoid libdrm_intel.pc cflags poisoning
      (-I/usr/include/valgrind brings valgrind config.h to compiler scope, breaking some projects using local config.h)
    - release 2

 libdrm.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libdrm.spec b/libdrm.spec
index 660adcb..0941592 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,12 +1,13 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# static libraries
+%bcond_with	valgrind	# valgrind support in libdrm
 
 Summary:	Userspace interface to kernel DRM services
 Summary(pl.UTF-8):	Interfejs przestrzeni użytkownika do usług DRM jądra
 Name:		libdrm
 Version:	2.4.101
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 Source0:	https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
@@ -24,7 +25,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	valgrind
+%{?with_valgrind:BuildRequires:	valgrind}
 %ifarch %{ix86} %{x8664} x32
 BuildRequires:	xorg-lib-libpciaccess-devel >= 0.10
 %endif
@@ -75,6 +76,7 @@ Statyczna biblioteka libdrm.
 
 %build
 %meson build \
+	%{!?with_valgrind:-Dvalgrind=false} \
 %ifarch %{arm} aarch64
 	-Detnaviv=true \
 	-Dexynos=true \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdrm.git/commitdiff/86ed43cb55c12ee283648eb743ed78b51ba4411f



More information about the pld-cvs-commit mailing list