[packages/xorg-xserver-server] - ensure CPP is cpp regardless of rpm version, fixes dtrace preprocessing

qboosh qboosh at pld-linux.org
Mon Mar 3 20:16:32 CET 2025


commit 57201d1f15b04beef00f60c19ceefb25d7a25a4a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 3 20:03:39 2025 +0100

    - ensure CPP is cpp regardless of rpm version, fixes dtrace preprocessing

 xorg-xserver-server.spec | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 6f79af7..f61bbdf 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -194,6 +194,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		tirpc_cflags	$(pkg-config --cflags libtirpc)
 %define		tirpc_libs	$(pkg-config --libs libtirpc)
 
+# dtrace script expects CPP to be cpp, not "gcc -E", so force it regardless of rpm version
+# (autotools-based rpm<4.19 used to have "gcc -E", cmake builds for 4.19+ switched to cpp)
+%define		__cpp	cpp
+
 %description
 Xorg server is a generally used X server which uses display hardware.
 It requires proper driver for your display hardware.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/57201d1f15b04beef00f60c19ceefb25d7a25a4a



More information about the pld-cvs-commit mailing list