Fix cmake flags to compile with -m32

3 files changed, 36 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c7f549b54cf..de6815fb66bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Mar  5 10:11:32 UTC 2021
+# Fri Apr 30 13:38:22 UTC 2021
 pkgbase = lib32-suitesparse
 	pkgdesc = A collection of sparse matrix libraries (32-bit)
 	pkgver = 5.9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://faculty.cse.tamu.edu/davis/suitesparse.html
 	arch = x86_64
 	license = GPL
@@ -12,14 +12,16 @@ pkgbase = lib32-suitesparse
 	makedepends = chrpath
 	depends = lib32-metis
 	depends = lib32-lapack
-	depends = lib32-intel-tbb
+	depends = lib32-tbb
 	depends = suitesparse
 	depends = lib32-mpfr
 	options = staticlibs
 	source = suitesparse-5.9.0.tar.gz::https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.9.0.tar.gz
 	source = suitesparse-no-demo.patch
+	source = flags.patch
 	sha512sums = d0b7de23d769b4537a9deac7a7c42408f29ddaa66e2c4be2c4b6465a6e8b60f7705db8b2a8de89808208a2fdd8e6ac8e25e54a0429952b16a1b22ce2e4469475
 	sha512sums = f7bfd7fd8d8defd1e7dc1afdb05ed9fe32ab144b82052a6863b96b8c423521aca9560d093c82aca02da493473d5cda90482fd084f528b90f33590fae2cf5e4d9
+	sha512sums = 04932d71c044859681611c803a47bc58306ca5962c92ab843b32502138e369826e7bb8a02d6adc73e0c64f4b3988bf44c72befd37562d0eec569bb62caced760
 
 pkgname = lib32-suitesparse
 
diff --git a/PKGBUILD b/PKGBUILD
index 5c71d0341816..9bb015aa4126 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,26 @@
 pkgname=lib32-suitesparse
 _pkgbase=suitesparse
 pkgver=5.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of sparse matrix libraries (32-bit)"
 url="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 arch=('x86_64')
-depends=('lib32-metis' 'lib32-lapack' 'lib32-intel-tbb' 'suitesparse'
+depends=('lib32-metis' 'lib32-lapack' 'lib32-tbb' 'suitesparse'
          'lib32-mpfr')
 makedepends=('gcc-fortran-multilib' 'cmake' 'chrpath')
 license=('GPL')
 options=('staticlibs')
 source=($_pkgbase-$pkgver.tar.gz::"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$pkgver.tar.gz"
-        "suitesparse-no-demo.patch")
+        "suitesparse-no-demo.patch"
+        "flags.patch")
 sha512sums=('d0b7de23d769b4537a9deac7a7c42408f29ddaa66e2c4be2c4b6465a6e8b60f7705db8b2a8de89808208a2fdd8e6ac8e25e54a0429952b16a1b22ce2e4469475'
-            'f7bfd7fd8d8defd1e7dc1afdb05ed9fe32ab144b82052a6863b96b8c423521aca9560d093c82aca02da493473d5cda90482fd084f528b90f33590fae2cf5e4d9')
+            'f7bfd7fd8d8defd1e7dc1afdb05ed9fe32ab144b82052a6863b96b8c423521aca9560d093c82aca02da493473d5cda90482fd084f528b90f33590fae2cf5e4d9'
+            '04932d71c044859681611c803a47bc58306ca5962c92ab843b32502138e369826e7bb8a02d6adc73e0c64f4b3988bf44c72befd37562d0eec569bb62caced760')
 
 prepare() {
   cd "${srcdir}/SuiteSparse-$pkgver"
   patch -p1 -i ../suitesparse-no-demo.patch
+  patch -p1 -i ../flags.patch
 }
 
 build() {
diff --git a/flags.patch b/flags.patch
new file mode 100644
index 000000000000..7051706e31e7
--- /dev/null
+++ b/flags.patch
@@ -0,0 +1,24 @@
+diff -ruN SuiteSparse-5.9.0/Mongoose/CMakeLists.txt SuiteSparse-5.9.0.new/Mongoose/CMakeLists.txt
+--- SuiteSparse-5.9.0/Mongoose/CMakeLists.txt	2021-03-04 01:34:33.000000000 +0330
++++ SuiteSparse-5.9.0.new/Mongoose/CMakeLists.txt	2021-04-30 18:06:24.312588249 +0430
+@@ -328,7 +328,7 @@
+     SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g")
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+     # using GCC
+-    SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
++    SET(CMAKE_CXX_FLAGS "-m32 -O3 -fwrapv")
+     # Debug flags for GCC
+     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6")
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+diff -ruN SuiteSparse-5.9.0/SuiteSparse_config/SuiteSparse_config.mk SuiteSparse-5.9.0.new/SuiteSparse_config/SuiteSparse_config.mk
+--- SuiteSparse-5.9.0/SuiteSparse_config/SuiteSparse_config.mk	2021-03-04 01:34:33.000000000 +0330
++++ SuiteSparse-5.9.0.new/SuiteSparse_config/SuiteSparse_config.mk	2021-04-30 18:01:37.603417101 +0430
+@@ -146,7 +146,7 @@
+         endif
+     endif
+ 
+-    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
++    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-m32
+ 
+     #---------------------------------------------------------------------------
+     # CFLAGS for the C/C++ compiler