[packages/argyllcms] fix build on x32

atler atler at pld-linux.org
Sun Apr 24 21:08:22 CEST 2022


commit cfc14e1c6164a447ded32e7de7e33a2279b47e6d
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Apr 24 21:08:08 2022 +0200

    fix build on x32

 argyllcms.spec |  2 ++
 x32.patch      | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
---
diff --git a/argyllcms.spec b/argyllcms.spec
index 4b40efa..b594aa1 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -7,6 +7,7 @@ License:	AGPL v3, MIT, GPL v2+, LGPL v2.1+, FDL v1.3
 Group:		X11/Applications/Graphics
 Source0:	https://www.argyllcms.com/Argyll_V%{version}_src.zip
 # Source0-md5:	24216dad044d6b336d1a2bcb45fb5d6f
+Patch0:		x32.patch
 URL:		http://www.argyllcms.com/
 BuildRequires:	jam
 BuildRequires:	libjpeg-devel
@@ -84,6 +85,7 @@ Argyll.
 
 %prep
 %setup -q -n Argyll_V%{version}
+%patch0 -p1
 
 %build
 export CC="%{__cc}"
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..ded91b2
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,31 @@
+diff -ur Argyll_V2.3.0.orig/Jambase Argyll_V2.3.0/Jambase
+--- Argyll_V2.3.0.orig/Jambase	2021-12-23 23:37:07.000000000 +0100
++++ Argyll_V2.3.0/Jambase	2022-04-24 21:01:17.080866907 +0200
+@@ -1011,16 +1011,6 @@
+ 		HOSTTYPE = $(JAMUNAME[1]) ;
+ 	}
+ 
+-	if $(HOSTTYPE) = x86_64 
+-	 || $(HOSTTYPE) = x86_64-linux
+-	 || $(HOSTTYPE) = amd64 {
+-		ECHO "We're on a 64 bit host" ;
+-		HOST64     = true ;
+-		CCFLAGS	   += -m64 ;
+-		C++FLAGS   += -m64 ;
+-	}
+-
+-
+ 	# Hmm. Newer linux gcc ar defaults to no timestamps
+ 	# and introduces a new option to get old behaviour,
+ 	# breaking the dependency determination.
+diff -ur Argyll_V2.3.0.orig/Jamtop Argyll_V2.3.0/Jamtop
+--- Argyll_V2.3.0.orig/Jamtop	2021-12-23 23:37:07.000000000 +0100
++++ Argyll_V2.3.0/Jamtop	2022-04-24 21:01:08.610422555 +0200
+@@ -162,6 +162,7 @@
+ 			if  [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
+ 			 || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
+ 			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
++			 || [ GLOB /usr/libx32 : lib$(lcase).so ] || [ GLOB /usr/libx32 : lib$(lcase).a ]
+ 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
+ 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
+ 	         || [ GLOB /usr/lib/i386-linux-gnu : lib$(lcase).so ]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/argyllcms.git/commitdiff/cfc14e1c6164a447ded32e7de7e33a2279b47e6d



More information about the pld-cvs-commit mailing list