[packages/wlroots] - make x32 patch rely on compiler, not rpm

baggins baggins at pld-linux.org
Fri Feb 5 20:24:04 CET 2021


commit 04cd35eeb74a8338e44522e768411488c6a8bfb6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Feb 5 20:23:23 2021 +0100

    - make x32 patch rely on compiler, not rpm

 wlroots.spec | 2 --
 x32.patch    | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/wlroots.spec b/wlroots.spec
index 032b1b5..b5078b4 100644
--- a/wlroots.spec
+++ b/wlroots.spec
@@ -85,9 +85,7 @@ Static wlroots library.
 
 %prep
 %setup -q
-%ifarch x32
 %patch0 -p1
-%endif
 
 %build
 %meson build
diff --git a/x32.patch b/x32.patch
index 35ac873..cdfc2c2 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,14 @@
 --- wlroots-0.12.0/util/log.c.orig	2020-11-08 15:01:44.000000000 +0100
 +++ wlroots-0.12.0/util/log.c	2021-02-03 10:32:04.394433021 +0100
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,11 @@
  	clock_gettime(CLOCK_MONOTONIC, &ts);
  	timespec_sub(&ts, &ts, &start_time);
  
--	fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
++#ifdef __ILP32__
 +	fprintf(stderr, "%02d:%02d:%02d.%03lld ", (int)(ts.tv_sec / 60 / 60),
++#else
+ 	fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
++#endif
  		(int)(ts.tv_sec / 60 % 60), (int)(ts.tv_sec % 60),
  		ts.tv_nsec / 1000000);
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wlroots.git/commitdiff/04cd35eeb74a8338e44522e768411488c6a8bfb6



More information about the pld-cvs-commit mailing list