From 3b4d8ba573fe8d1c23fbe3edba7fbbad41267bb0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 2 Feb 2015 00:02:46 +0000 Subject: [PATCH] suitesparse: Added (WIP) --- .../0001-Win32-Do-not-link-librt.patch | 144 +++++++ ...d-strip-trailing-cr-to-diff-for-crlf.patch | 398 ++++++++++++++++++ mingw-w64-suitesparse/PKGBUILD | 49 +++ 3 files changed, 591 insertions(+) create mode 100644 mingw-w64-suitesparse/0001-Win32-Do-not-link-librt.patch create mode 100644 mingw-w64-suitesparse/0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch create mode 100644 mingw-w64-suitesparse/PKGBUILD diff --git a/mingw-w64-suitesparse/0001-Win32-Do-not-link-librt.patch b/mingw-w64-suitesparse/0001-Win32-Do-not-link-librt.patch new file mode 100644 index 0000000000..9c95d0170f --- /dev/null +++ b/mingw-w64-suitesparse/0001-Win32-Do-not-link-librt.patch @@ -0,0 +1,144 @@ +diff -urN SuiteSparse.orig/GPUQREngine/Demo/Makefile SuiteSparse/GPUQREngine/Demo/Makefile +--- SuiteSparse.orig/GPUQREngine/Demo/Makefile 2015-02-01 12:07:54.875166100 +0000 ++++ SuiteSparse/GPUQREngine/Demo/Makefile 2015-02-01 12:09:29.881730400 +0000 +@@ -8,7 +8,7 @@ + ../../SuiteSparse_GPURuntime/Lib/libSuiteSparse_GPURuntime.a \ + ../../CHOLMOD/Lib/libcholmod.a \ + ../../SuiteSparse_config/libsuitesparseconfig.a \ +- $(CUDART_LIB) $(CUBLAS_LIB) -lm -lrt ++ $(CUDART_LIB) $(CUBLAS_LIB) -lm + + INC = -I../../SuiteSparse_GPURuntime/Include -I../Include \ + -I../../SuiteSparse_config -I../../CHOLMOD/Include +diff -urN SuiteSparse.orig/KLU/Tcov/Makefile SuiteSparse/KLU/Tcov/Makefile +--- SuiteSparse.orig/KLU/Tcov/Makefile 2015-02-01 12:07:54.916671400 +0000 ++++ SuiteSparse/KLU/Tcov/Makefile 2015-02-01 12:09:35.275415300 +0000 +@@ -23,7 +23,7 @@ + ../../CAMD/Lib/libcamd.a ../../CCOLAMD/Lib/libccolamd.a \ + ../../metis-4.0/libmetis.a \ + ../../SuiteSparse_config/libsuitesparseconfig.a \ +- $(LAPACK) $(BLAS) $(CUDART_LIB) $(CUBLAS_LIB) -lm -lrt ++ $(LAPACK) $(BLAS) $(CUDART_LIB) $(CUBLAS_LIB) -lm + + I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \ + -I../../BTF/Include -I../../CHOLMOD/Include -I../../CAMD/Include \ +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.mk 2015-02-01 12:07:55.130698600 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2015-02-01 12:10:51.118546200 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_backslash.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_backslash.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_backslash.mk 2015-02-01 12:07:55.131198600 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_backslash.mk 2015-02-01 12:12:19.955827100 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk 2015-02-01 12:07:55.131198600 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_debug.mk 2015-02-01 12:10:36.268660500 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk 2015-02-01 12:07:55.131698700 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_gcc.mk 2015-02-01 12:11:08.608767200 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk 2015-02-01 12:07:55.131698700 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc.mk 2015-02-01 12:11:49.473956400 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk 2015-02-01 12:07:55.132198800 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_GPU_icc10.mk 2015-02-01 12:12:02.795148000 +0000 +@@ -91,9 +91,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_linux.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_linux.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_linux.mk 2015-02-01 12:07:55.132198800 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_linux.mk 2015-02-01 12:12:27.206247800 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib +diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_Mac.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config_Mac.mk +--- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config_Mac.mk 2015-02-01 12:07:55.132698800 +0000 ++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config_Mac.mk 2015-02-01 12:12:12.022319700 +0000 +@@ -90,9 +90,9 @@ + F77LIB = + + # C and Fortran libraries. Remove -lrt if you don't have it. +- LIB = -lm -lrt ++# LIB = -lm -lrt + # Using the following requires CF = ... -DNTIMER on POSIX C systems. +-# LIB = -lm ++ LIB = -lm + + # For "make install" + INSTALL_LIB = /usr/local/lib diff --git a/mingw-w64-suitesparse/0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch b/mingw-w64-suitesparse/0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch new file mode 100644 index 0000000000..bc1c22a1c0 --- /dev/null +++ b/mingw-w64-suitesparse/0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch @@ -0,0 +1,398 @@ +diff -urN SuiteSparse.orig/AMD/Demo/Makefile SuiteSparse/AMD/Demo/Makefile +--- SuiteSparse.orig/AMD/Demo/Makefile 2015-02-01 12:31:49.150295900 +0000 ++++ SuiteSparse/AMD/Demo/Makefile 2015-02-01 12:38:28.692531400 +0000 +@@ -28,22 +28,22 @@ + amd_demo: amd_demo.c library $(INC) + $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB2) + ./amd_demo > my_amd_demo.out +- - diff amd_demo.out my_amd_demo.out ++ - diff --strip-trailing-cr amd_demo.out my_amd_demo.out + + amd_l_demo: amd_l_demo.c library $(INC) + $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB2) + ./amd_l_demo > my_amd_l_demo.out +- - diff amd_l_demo.out my_amd_l_demo.out ++ - diff --strip-trailing-cr amd_l_demo.out my_amd_l_demo.out + + amd_demo2: amd_demo2.c library $(INC) + $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB2) + ./amd_demo2 > my_amd_demo2.out +- - diff amd_demo2.out my_amd_demo2.out ++ - diff --strip-trailing-cr amd_demo2.out my_amd_demo2.out + + amd_simple: amd_simple.c library $(INC) + $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB2) + ./amd_simple > my_amd_simple.out +- - diff amd_simple.out my_amd_simple.out ++ - diff --strip-trailing-cr amd_simple.out my_amd_simple.out + + #------------------------------------------------------------------------------ + # compile the Fortran demo +@@ -57,13 +57,13 @@ + $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \ + $(F77LIB) + ./amd_f77demo > my_amd_f77demo.out +- - diff amd_f77demo.out my_amd_f77demo.out ++ - diff --strip-trailing-cr amd_f77demo.out my_amd_f77demo.out + + amd_f77simple: amd_f77simple.f f77lib + $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \ + ../Lib/libamdf77.a $(F77LIB) + ./amd_f77simple > my_amd_f77simple.out +- - diff amd_f77simple.out my_amd_f77simple.out ++ - diff --strip-trailing-cr amd_f77simple.out my_amd_f77simple.out + + amd_f77wrapper.o: amd_f77wrapper.c + $(C) -DDINT -c amd_f77wrapper.c +@@ -72,7 +72,7 @@ + $(F77) $(F77FLAGS) -o amd_f77cross amd_f77cross.f amd_f77wrapper.o \ + ../Lib/libamd.a $(F77LIB) + ./amd_f77cross > my_amd_f77cross.out +- - diff amd_f77cross.out my_amd_f77cross.out ++ - diff --strip-trailing-cr amd_f77cross.out my_amd_f77cross.out + + #------------------------------------------------------------------------------ + # Remove all but the files in the original distribution +diff -urN SuiteSparse.orig/CAMD/Demo/Makefile SuiteSparse/CAMD/Demo/Makefile +--- SuiteSparse.orig/CAMD/Demo/Makefile 2015-02-01 12:31:49.024780000 +0000 ++++ SuiteSparse/CAMD/Demo/Makefile 2015-02-01 12:42:35.739902400 +0000 +@@ -25,22 +25,22 @@ + camd_demo: camd_demo.c library $(INC) + $(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB2) + ./camd_demo > my_camd_demo.out +- - diff camd_demo.out my_camd_demo.out ++ - diff --strip-trailing-cr camd_demo.out my_camd_demo.out + + camd_l_demo: camd_l_demo.c library $(INC) + $(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB2) + ./camd_l_demo > my_camd_l_demo.out +- - diff camd_l_demo.out my_camd_l_demo.out ++ - diff --strip-trailing-cr camd_l_demo.out my_camd_l_demo.out + + camd_demo2: camd_demo2.c library $(INC) + $(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB2) + ./camd_demo2 > my_camd_demo2.out +- - diff camd_demo2.out my_camd_demo2.out ++ - diff --strip-trailing-cr camd_demo2.out my_camd_demo2.out + + camd_simple: camd_simple.c library $(INC) + $(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB2) + ./camd_simple > my_camd_simple.out +- - diff camd_simple.out my_camd_simple.out ++ - diff --strip-trailing-cr camd_simple.out my_camd_simple.out + + #------------------------------------------------------------------------------ + # Remove all but the files in the original distribution +diff -urN SuiteSparse.orig/CCOLAMD/Demo/Makefile SuiteSparse/CCOLAMD/Demo/Makefile +--- SuiteSparse.orig/CCOLAMD/Demo/Makefile 2015-02-01 12:31:49.037281600 +0000 ++++ SuiteSparse/CCOLAMD/Demo/Makefile 2015-02-01 12:38:28.694031500 +0000 +@@ -25,12 +25,12 @@ + ccolamd_example: ccolamd_example.c library + $(C) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.a $(LIB2) + - ./ccolamd_example > my_ccolamd_example.out +- - diff ccolamd_example.out my_ccolamd_example.out ++ - diff --strip-trailing-cr ccolamd_example.out my_ccolamd_example.out + + ccolamd_l_example: ccolamd_l_example.c library + $(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a $(LIB2) + - ./ccolamd_l_example > my_ccolamd_l_example.out +- - diff ccolamd_l_example.out my_ccolamd_l_example.out ++ - diff --strip-trailing-cr ccolamd_l_example.out my_ccolamd_l_example.out + + #------------------------------------------------------------------------------ + # Remove all but the files in the original distribution +diff -urN SuiteSparse.orig/CHOLMOD/Tcov/Makefile SuiteSparse/CHOLMOD/Tcov/Makefile +--- SuiteSparse.orig/CHOLMOD/Tcov/Makefile 2015-02-01 12:31:48.385198800 +0000 ++++ SuiteSparse/CHOLMOD/Tcov/Makefile 2015-02-01 12:38:28.696031800 +0000 +@@ -408,7 +408,7 @@ + $(V) ./cmread Matrix/2diag.tri > tmp/2diag.out + $(V) ./cmread Matrix/r5lo > tmp/r5lo.out + $(V) ./cmread Matrix/r5lo2 > tmp/r5lo2.out +- - diff tmp/r5lo.out tmp/r5lo2.out ++ - diff --strip-trailing-cr tmp/r5lo.out tmp/r5lo2.out + $(V) ./cmread Matrix/cs.mtx > tmp/cs.out + $(V) ./cmread Matrix/2lo.tri > tmp/2lo.out + $(V) ./cmread Matrix/2.tri > tmp/2.out +@@ -442,7 +442,7 @@ + $(V) ./clread Matrix/2diag.tri > tmp/l_2diag.out + $(V) ./clread Matrix/r5lo > tmp/l_r5lo.out + $(V) ./clread Matrix/r5lo2 > tmp/l_r5lo2.out +- - diff tmp/r5lo.out tmp/r5lo2.out ++ - diff --strip-trailing-cr tmp/r5lo.out tmp/r5lo2.out + $(V) ./clread Matrix/cs.mtx > tmp/l_cs.out + $(V) ./clread Matrix/2lo.tri > tmp/l_l_2lo.out + $(V) ./clread Matrix/2.tri > tmp/l_2.out +diff -urN SuiteSparse.orig/COLAMD/Demo/Makefile SuiteSparse/COLAMD/Demo/Makefile +--- SuiteSparse.orig/COLAMD/Demo/Makefile 2015-02-01 12:31:48.391199500 +0000 ++++ SuiteSparse/COLAMD/Demo/Makefile 2015-02-01 12:38:28.697532000 +0000 +@@ -25,12 +25,12 @@ + colamd_example: colamd_example.c library + $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a $(LIB2) + - ./colamd_example > my_colamd_example.out +- - diff colamd_example.out my_colamd_example.out ++ - diff --strip-trailing-cr colamd_example.out my_colamd_example.out + + colamd_l_example: colamd_l_example.c library + $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a $(LIB2) + - ./colamd_l_example > my_colamd_l_example.out +- - diff colamd_l_example.out my_colamd_l_example.out ++ - diff --strip-trailing-cr colamd_l_example.out my_colamd_l_example.out + + #------------------------------------------------------------------------------ + # Remove all but the files in the original distribution +diff -urN SuiteSparse.orig/LDL/Demo/Makefile SuiteSparse/LDL/Demo/Makefile +--- SuiteSparse.orig/LDL/Demo/Makefile 2015-02-01 12:31:48.829755200 +0000 ++++ SuiteSparse/LDL/Demo/Makefile 2015-02-01 12:38:28.701532500 +0000 +@@ -26,48 +26,48 @@ + ldlmain: ldlmain.c library + $(C) ldlmain.c ../Lib/libldl.a -o ldlmain $(LIB2) + - ./ldlmain > my_ldlmain.out +- - diff ldlmain.out my_ldlmain.out ++ - diff --strip-trailing-cr ldlmain.out my_ldlmain.out + + ldllmain: ldlmain.c library + $(C) -DLDL_LONG ldlmain.c ../Lib/libldl.a -o ldllmain $(LIB2) + - ./ldllmain > my_ldllmain.out +- - diff ldlmain.out my_ldllmain.out ++ - diff --strip-trailing-cr ldlmain.out my_ldllmain.out + + ldlsimple: ldlsimple.c library + $(C) ldlsimple.c ../Lib/libldl.a -o ldlsimple $(LIB2) + - ./ldlsimple > my_ldlsimple.out +- - diff ldlsimple.out my_ldlsimple.out ++ - diff --strip-trailing-cr ldlsimple.out my_ldlsimple.out + + ldllsimple: ldlsimple.c library + $(C) $(I) -DLDL_LONG ldlsimple.c ../Lib/libldl.a -o ldllsimple $(LIB2) + - ./ldllsimple > my_ldllsimple.out +- - diff ldlsimple.out my_ldllsimple.out ++ - diff --strip-trailing-cr ldlsimple.out my_ldllsimple.out + + ldlamd: ldlmain.c library + - $(C) -I../../AMD/Include -DUSE_AMD \ + ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldlamd $(LIB2) + - ./ldlamd > my_ldlamd.out +- - diff ldlamd.out my_ldlamd.out ++ - diff --strip-trailing-cr ldlamd.out my_ldlamd.out + + ldllamd: ldlmain.c library + - $(C) -DLDL_LONG $(I) -I../../AMD/Include -DUSE_AMD \ + ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldllamd $(LIB2) + - ./ldllamd > my_ldllamd.out +- - diff ldllamd.out my_ldllamd.out ++ - diff --strip-trailing-cr ldllamd.out my_ldllamd.out + + run: + - ./ldlsimple > my_ldlsimple.out +- - diff ldlsimple.out my_ldlsimple.out ++ - diff --strip-trailing-cr ldlsimple.out my_ldlsimple.out + - ./ldllsimple > my_ldllsimple.out +- - diff ldlsimple.out my_ldllsimple.out ++ - diff --strip-trailing-cr ldlsimple.out my_ldllsimple.out + - ./ldlmain > my_ldlmain.out +- - diff ldlmain.out my_ldlmain.out ++ - diff --strip-trailing-cr ldlmain.out my_ldlmain.out + - ./ldllmain > my_ldllmain.out +- - diff ldlmain.out my_ldllmain.out ++ - diff --strip-trailing-cr ldlmain.out my_ldllmain.out + - ./ldlamd > my_ldlamd.out +- - diff ldlamd.out my_ldlamd.out ++ - diff --strip-trailing-cr ldlamd.out my_ldlamd.out + - ./ldllamd > my_ldllamd.out +- - diff ldllamd.out my_ldllamd.out ++ - diff --strip-trailing-cr ldllamd.out my_ldllamd.out + + + #------------------------------------------------------------------------------- +diff -urN SuiteSparse.orig/MATLAB_Tools/SFMULT/Makefile SuiteSparse/MATLAB_Tools/SFMULT/Makefile +--- SuiteSparse.orig/MATLAB_Tools/SFMULT/Makefile 2015-02-01 12:31:48.874260900 +0000 ++++ SuiteSparse/MATLAB_Tools/SFMULT/Makefile 2015-02-01 12:38:28.703032700 +0000 +@@ -3,23 +3,23 @@ + diffs: kernel_diffs kernel_usage_diffs structure_diffs + + kernel_diffs: +- - diff sfmult_anxnyt_k.c sfmult_anxtyt_k.c +- - diff sfmult_atxtyn_k.c sfmult_atxtyt_k.c +- - diff sfmult_vector_1.c sfmult_vector_k.c ++ - diff --strip-trailing-cr sfmult_anxnyt_k.c sfmult_anxtyt_k.c ++ - diff --strip-trailing-cr sfmult_atxtyn_k.c sfmult_atxtyt_k.c ++ - diff --strip-trailing-cr sfmult_vector_1.c sfmult_vector_k.c + + # each of these pairs use the same sfmult_A*_X*_Y*_[234] kernels + kernel_usage_diffs: +- - diff sfmult_anxtyn.c sfmult_anxtyt.c +- - diff sfmult_anxnyn.c sfmult_anxnyt.c +- - diff sfmult_atxnyn.c sfmult_atxtyn.c +- - diff sfmult_atxnyt.c sfmult_atxtyt.c ++ - diff --strip-trailing-cr sfmult_anxtyn.c sfmult_anxtyt.c ++ - diff --strip-trailing-cr sfmult_anxnyn.c sfmult_anxnyt.c ++ - diff --strip-trailing-cr sfmult_atxnyn.c sfmult_atxtyn.c ++ - diff --strip-trailing-cr sfmult_atxnyt.c sfmult_atxtyt.c + + # each of these pairs use the same outer structure but different kernels + structure_diffs: +- - diff sfmult_anxnyn.c sfmult_anxtyn.c +- - diff sfmult_anxnyt.c sfmult_anxtyt.c +- - diff sfmult_atxnyn.c sfmult_atxnyt.c +- - diff sfmult_atxtyn.c sfmult_atxtyt.c ++ - diff --strip-trailing-cr sfmult_anxnyn.c sfmult_anxtyn.c ++ - diff --strip-trailing-cr sfmult_anxnyt.c sfmult_anxtyt.c ++ - diff --strip-trailing-cr sfmult_atxnyn.c sfmult_atxnyt.c ++ - diff --strip-trailing-cr sfmult_atxtyn.c sfmult_atxtyt.c + + OBJ = \ + sfmult_anxnyn.o \ +diff -urN SuiteSparse.orig/SuiteSparse_config/Makefile SuiteSparse/SuiteSparse_config/Makefile +--- SuiteSparse.orig/SuiteSparse_config/Makefile 2015-02-01 12:31:49.012778500 +0000 ++++ SuiteSparse/SuiteSparse_config/Makefile 2015-02-01 12:38:28.705032900 +0000 +@@ -42,7 +42,7 @@ + $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h + + dif: +- - diff SuiteSparse_config.mk SuiteSparse_config_linux.mk +- - diff SuiteSparse_config_linux.mk SuiteSparse_config_GPU_gcc.mk +- - diff SuiteSparse_config_GPU_gcc.mk SuiteSparse_config_GPU_icc.mk +- - diff SuiteSparse_config_GPU_icc.mk SuiteSparse_config_GPU_icc10.mk ++ - diff --strip-trailing-cr SuiteSparse_config.mk SuiteSparse_config_linux.mk ++ - diff --strip-trailing-cr SuiteSparse_config_linux.mk SuiteSparse_config_GPU_gcc.mk ++ - diff --strip-trailing-cr SuiteSparse_config_GPU_gcc.mk SuiteSparse_config_GPU_icc.mk ++ - diff --strip-trailing-cr SuiteSparse_config_GPU_icc.mk SuiteSparse_config_GPU_icc10.mk +diff -urN SuiteSparse.orig/UMFPACK/Demo/Makefile SuiteSparse/UMFPACK/Demo/Makefile +--- SuiteSparse.orig/UMFPACK/Demo/Makefile 2015-02-01 12:31:49.053283600 +0000 ++++ SuiteSparse/UMFPACK/Demo/Makefile 2015-02-01 12:38:28.706533100 +0000 +@@ -139,13 +139,13 @@ + run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple + ./umfpack_simple + ./umfpack_di_demo > my_umfpack_di_demo.out +- - diff umfpack_di_demo.out my_umfpack_di_demo.out ++ - diff --strip-trailing-cr umfpack_di_demo.out my_umfpack_di_demo.out + ./umfpack_dl_demo > my_umfpack_dl_demo.out +- - diff umfpack_dl_demo.out my_umfpack_dl_demo.out ++ - diff --strip-trailing-cr umfpack_dl_demo.out my_umfpack_dl_demo.out + ./umfpack_zi_demo > my_umfpack_zi_demo.out +- - diff umfpack_zi_demo.out my_umfpack_zi_demo.out ++ - diff --strip-trailing-cr umfpack_zi_demo.out my_umfpack_zi_demo.out + ./umfpack_zl_demo > my_umfpack_zl_demo.out +- - diff umfpack_zl_demo.out my_umfpack_zl_demo.out ++ - diff --strip-trailing-cr umfpack_zl_demo.out my_umfpack_zl_demo.out + + #------------------------------------------------------------------------------- + # create a demo program that reads in Harwell/Boeing matrices, and run it +@@ -196,17 +196,17 @@ + $(F77) $(F77FLAGS) -o umf4hb umf4hb.f umf4_f77wrapper.o \ + $(UMFPACK) $(LIBS) + - ./umf4hb < HB/west0067.rua > my_umf4hb.out +- - diff my_umf4hb.out umf4hb.out ++ - diff --strip-trailing-cr my_umf4hb.out umf4hb.out + $(F77) $(F77FLAGS) -o umf4zhb umf4zhb.f umf4_f77zwrapper.o \ + $(UMFPACK) $(LIBS) + - ./umf4zhb < HB/qc324.cua > my_umf4zhb.out +- - diff my_umf4zhb.out umf4zhb.out ++ - diff --strip-trailing-cr my_umf4zhb.out umf4zhb.out + + fortran64: $(UMFPACK) umf4hb64.f umf4_f77wrapper64.o umf4_f77zwrapper64.o $(UMFPACK) + $(F77) $(F77FLAGS) -o umf4hb64 umf4hb64.f umf4_f77wrapper64.o \ + $(UMFPACK) $(LIBS) + - ./umf4hb64 < HB/west0067.rua > my_umf4hb64.out +- - diff my_umf4hb64.out umf4hb64.out ++ - diff --strip-trailing-cr my_umf4hb64.out umf4hb64.out + + umf4_f77wrapper.o: umf4_f77wrapper.c $(INC) + $(C) -c umf4_f77wrapper.c -o umf4_f77wrapper.o +diff -urN SuiteSparse.orig/UMFPACK/Tcov/AMD_Demo_Makefile SuiteSparse/UMFPACK/Tcov/AMD_Demo_Makefile +--- SuiteSparse.orig/UMFPACK/Tcov/AMD_Demo_Makefile 2015-02-01 12:31:49.130793500 +0000 ++++ SuiteSparse/UMFPACK/Tcov/AMD_Demo_Makefile 2015-02-01 12:38:28.709033500 +0000 +@@ -27,22 +27,22 @@ + amd_demo: amd_demo.c library $(INC) + $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB2) + ./amd_demo > my_amd_demo.out +- - diff amd_demo.out my_amd_demo.out ++ - diff --strip-trailing-cr amd_demo.out my_amd_demo.out + + amd_l_demo: amd_l_demo.c library $(INC) + $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB2) + ./amd_l_demo > my_amd_l_demo.out +- - diff amd_l_demo.out my_amd_l_demo.out ++ - diff --strip-trailing-cr amd_l_demo.out my_amd_l_demo.out + + amd_demo2: amd_demo2.c library $(INC) + $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB2) + ./amd_demo2 > my_amd_demo2.out +- - diff amd_demo2.out my_amd_demo2.out ++ - diff --strip-trailing-cr amd_demo2.out my_amd_demo2.out + + amd_simple: amd_simple.c library $(INC) + $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB2) + ./amd_simple > my_amd_simple.out +- - diff amd_simple.out my_amd_simple.out ++ - diff --strip-trailing-cr amd_simple.out my_amd_simple.out + + #------------------------------------------------------------------------------ + # compile the Fortran demo +@@ -56,13 +56,13 @@ + $(F77) $(F77FLAGS) -o amd_f77demo amd_f77demo.f ../Lib/libamdf77.a \ + $(F77LIB) + ./amd_f77demo > my_amd_f77demo.out +- - diff amd_f77demo.out my_amd_f77demo.out ++ - diff --strip-trailing-cr amd_f77demo.out my_amd_f77demo.out + + amd_f77simple: amd_f77simple.f f77lib + $(F77) $(F77FLAGS) -o amd_f77simple amd_f77simple.f \ + ../Lib/libamdf77.a $(F77LIB) + ./amd_f77simple > my_amd_f77simple.out +- - diff amd_f77simple.out my_amd_f77simple.out ++ - diff --strip-trailing-cr amd_f77simple.out my_amd_f77simple.out + + amd_f77wrapper.o: amd_f77wrapper.c + $(C) -DDINT -c amd_f77wrapper.c +@@ -71,7 +71,7 @@ + $(F77) $(F77FLAGS) -o amd_f77cross amd_f77cross.f amd_f77wrapper.o \ + ../Lib/libamd.a $(F77LIB) + ./amd_f77cross > my_amd_f77cross.out +- - diff amd_f77cross.out my_amd_f77cross.out ++ - diff --strip-trailing-cr amd_f77cross.out my_amd_f77cross.out + + #------------------------------------------------------------------------------ + # Remove all but the files in the original distribution +diff -urN SuiteSparse.orig/UMFPACK/Tcov/Demo_Makefile SuiteSparse/UMFPACK/Tcov/Demo_Makefile +--- SuiteSparse.orig/UMFPACK/Tcov/Demo_Makefile 2015-02-01 12:31:49.125292800 +0000 ++++ SuiteSparse/UMFPACK/Tcov/Demo_Makefile 2015-02-01 12:38:28.711033700 +0000 +@@ -100,13 +100,13 @@ + run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple + ./umfpack_simple + ./umfpack_di_demo > my_umfpack_di_demo.out +- - diff umfpack_di_demo.out my_umfpack_di_demo.out ++ - diff --strip-trailing-cr umfpack_di_demo.out my_umfpack_di_demo.out + ./umfpack_dl_demo > my_umfpack_dl_demo.out +- - diff umfpack_dl_demo.out my_umfpack_dl_demo.out ++ - diff --strip-trailing-cr umfpack_dl_demo.out my_umfpack_dl_demo.out + ./umfpack_zi_demo > my_umfpack_zi_demo.out +- - diff umfpack_zi_demo.out my_umfpack_zi_demo.out ++ - diff --strip-trailing-cr umfpack_zi_demo.out my_umfpack_zi_demo.out + ./umfpack_zl_demo > my_umfpack_zl_demo.out +- - diff umfpack_zl_demo.out my_umfpack_zl_demo.out ++ - diff --strip-trailing-cr umfpack_zl_demo.out my_umfpack_zl_demo.out + + #------------------------------------------------------------------------------- + # create a demo program that reads in Harwell/Boeing matrices, and run it +@@ -156,17 +156,17 @@ + $(F77) $(F77FLAGS) -o umf4hb umf4hb.f umf4_f77wrapper.o \ + $(UMFPACK) $(LIBS) + - ./umf4hb < HB/west0067.rua > my_umf4hb.out +- - diff my_umf4hb.out umf4hb.out ++ - diff --strip-trailing-cr my_umf4hb.out umf4hb.out + $(F77) $(F77FLAGS) -o umf4zhb umf4zhb.f umf4_f77zwrapper.o \ + $(UMFPACK) $(LIBS) + - ./umf4zhb < HB/qc324.cua > my_umf4zhb.out +- - diff my_umf4zhb.out umf4zhb.out ++ - diff --strip-trailing-cr my_umf4zhb.out umf4zhb.out + + fortran64: $(UMFPACK) umf4hb64.f umf4_f77wrapper64.o umf4_f77zwrapper64.o $(UMFPACK) + $(F77) $(F77FLAGS) -o umf4hb64 umf4hb64.f umf4_f77wrapper64.o \ + $(UMFPACK) $(LIBS) + - ./umf4hb64 < HB/west0067.rua > my_umf4hb64.out +- - diff my_umf4hb64.out umf4hb64.out ++ - diff --strip-trailing-cr my_umf4hb64.out umf4hb64.out + + umf4_f77wrapper.o: umf4_f77wrapper.c $(INC) + $(C) -c umf4_f77wrapper.c -o umf4_f77wrapper.o diff --git a/mingw-w64-suitesparse/PKGBUILD b/mingw-w64-suitesparse/PKGBUILD new file mode 100644 index 0000000000..7fddfab21d --- /dev/null +++ b/mingw-w64-suitesparse/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Ray Donnelly + +_realname=SuiteSparse +pkgname=("${MINGW_PACKAGE_PREFIX}-suitesparse") +pkgver=4.4.3 +pkgrel=1 +pkgdesc='A suite of sparse matrix algorithms (mingw-w64)' +license=('GPL') +groups=("${MINGW_PACKAGE_PREFIX}") +arch=('any') +source=("http://faculty.cse.tamu.edu/davis/${_realname}/${_realname}-${pkgver}.tar.gz" + "0001-Win32-Do-not-link-librt.patch" + "0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch") +depends=("${MINGW_PACKAGE_PREFIX}-openblas") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-fortran") +md5sums=('b2e6f2373d480aa6f0ea5ca3d5d531c3' + '7af25ee389fb79459615221a58ba465e' + '1773305ad707db5b88d253ea914b975b') + +prepare() { + cd "${srcdir}"/${_realname} + patch -p1 -i "${srcdir}"/0001-Win32-Do-not-link-librt.patch + patch -p1 -i "${srcdir}"/0002-Win32-Add-strip-trailing-cr-to-diff-for-crlf.patch +} + +build() { + [ -d "${srcdir}"/build-${CARCH} ] && rm -rf "${srcdir}"/build-${CARCH} + cp -rf "${srcdir}"/${_realname} build-${CARCH} + cd "${srcdir}"/build-${CARCH} + + # https://www.gnu.org/software/octave/doc/interpreter/Compiling-Octave-with-64_002dbit-Indexing.html says + # "On 64-bit Windows systems, use -DLONGBLAS="long long" instead.", but that seems wrong. If 64-bit indexing + # is wanted, then long long should be used on 32-bit Windows too I expect (unless LONGBLAS refers to pointer + # size in some instances?) + CFLAGS='-DLONGBLAS="long long"' \ + CXXFLAGS='-DLONGBLAS="long long"' \ + CC=gcc CXX=g++ \ + make +} + +check() { + cd "${srcdir}"/build-${CARCH} + make check +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +}