Mercurial > mxe-octave

comparison src/suitesparse-1-fixes.patch @ 6132:59871eac3409

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SuiteSparse: Update to version 5.11.0 * src/suitesparse.mk: Update version and checksum. * src/suitesparse-1-fixes.patch: Update patch. GraphBLAS no longer builds. But we don't need it anyway. So, skip building it for now.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 20 Mar 2022 17:38:06 +0100
parents dc8dca6acc60
children
comparison
equal deleted inserted replaced
6131:b663289c541d 6132:59871eac3409
13 13
14 diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk 14 diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
15 index 1111111..2222222 100644 15 index 1111111..2222222 100644
16 --- a/SuiteSparse_config/SuiteSparse_config.mk 16 --- a/SuiteSparse_config/SuiteSparse_config.mk
17 +++ b/SuiteSparse_config/SuiteSparse_config.mk 17 +++ b/SuiteSparse_config/SuiteSparse_config.mk
18 @@ -429,10 +429,8 @@ SO_OPTS = $(LDFLAGS) 18 @@ -440,7 +441,7 @@ SO_OPTS = $(LDFLAGS)
19 19
20 ifeq ($(UNAME),Windows) 20 ifeq ($(UNAME),Windows)
21 # Cygwin Make on Windows (untested) 21 # Cygwin Make on Windows
22 - AR_TARGET = $(LIBRARY).lib 22 - AR_TARGET = $(LIBRARY).lib
23 - SO_PLAIN = $(LIBRARY).dll
24 - SO_MAIN = $(LIBRARY).$(SO_VERSION).dll
25 - SO_TARGET = $(LIBRARY).$(VERSION).dll
26 + AR_TARGET = $(LIBRARY).a 23 + AR_TARGET = $(LIBRARY).a
27 + SO_TARGET = $(LIBRARY).dll 24 SO_TARGET = $(LIBRARY).dll
28 SO_INSTALL_NAME = echo 25 # The following two links are just garbage copies of the real target
29 else 26 # they aren't actually supported by this OS
30 # Mac or Linux/Unix
31 27
32 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 28 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
33 From: Tony Theodore <tonyt@logyst.com> 29 From: Tony Theodore <tonyt@logyst.com>
34 Date: Tue, 21 Nov 2017 00:41:07 +1100 30 Date: Tue, 21 Nov 2017 00:41:07 +1100
35 Subject: [PATCH 2/3] 31 Subject: [PATCH 2/3]
590 - $(RM) $(INSTALL_LIB)/$(SO_MAIN) 586 - $(RM) $(INSTALL_LIB)/$(SO_MAIN)
591 + $(RM) $(INSTALL_SO)/$(SO_TARGET) 587 + $(RM) $(INSTALL_SO)/$(SO_TARGET)
592 $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h 588 $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h
593 $(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt 589 $(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt
594 ( cd xerbla ; $(MAKE) uninstall ) 590 ( cd xerbla ; $(MAKE) uninstall )
595 diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk 591 diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk
596 index 1111111..2222222 100644 592 --- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-03-15 00:33:19.000000000 +0100
597 --- a/SuiteSparse_config/SuiteSparse_config.mk 593 +++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk 2022-03-20 13:25:30.876107144 +0100
598 +++ b/SuiteSparse_config/SuiteSparse_config.mk 594 @@ -73,6 +73,7 @@
599 @@ -54,6 +54,7 @@ SUITESPARSE_VERSION = 4.5.6
600 # and documentation in /solo/mydox. 595 # and documentation in /solo/mydox.
601 INSTALL ?= $(SUITESPARSE) 596 INSTALL ?= $(SUITESPARSE)
602 INSTALL_LIB ?= $(INSTALL)/lib 597 INSTALL_LIB ?= $(INSTALL)/lib
603 + INSTALL_SO ?= $(INSTALL)/lib 598 + INSTALL_SO ?= $(INSTALL)/lib
604 INSTALL_INCLUDE ?= $(INSTALL)/include 599 INSTALL_INCLUDE ?= $(INSTALL)/include
605 INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION) 600 INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION)
606 601
607 @@ -339,7 +340,7 @@ SUITESPARSE_VERSION = 4.5.6 602 @@ -349,7 +350,7 @@
608
609 ifeq ($(UNAME),Linux) 603 ifeq ($(UNAME),Linux)
610 # add the realtime library, librt, and SuiteSparse/lib 604 # add the posix realtime extensions library: librt
611 - LDLIBS += -lrt -Wl,-rpath=$(INSTALL_LIB) 605 LDLIBS += -lrt
612 + LDLIBS += -lrt -Wl,-rpath=$(INSTALL_SO) 606 - LDFLAGS += -Wl,-rpath=$(INSTALL_LIB)
607 + LDFLAGS += -Wl,-rpath=$(INSTALL_SO)
613 endif 608 endif
614 609
615 #--------------------------------------------------------------------------- 610 #---------------------------------------------------------------------------
616 @@ -428,10 +429,11 @@ SUITESPARSE_VERSION = 4.5.6 611 @@ -365,7 +366,7 @@
617 SO_OPTS = $(LDFLAGS) 612 LAPACK ?= -framework Accelerate
618 613 # OpenMP is not yet supported by default in clang
619 ifeq ($(UNAME),Windows) 614 CFOPENMP =
620 - # Cygwin Make on Windows (untested) 615 - LDLIBS += -rpath $(INSTALL_LIB)
621 AR_TARGET = $(LIBRARY).a 616 + LDLIBS += -rpath $(INSTALL_SO)
622 SO_TARGET = $(LIBRARY).dll 617 endif
623 SO_INSTALL_NAME = echo 618
619 #---------------------------------------------------------------------------
620 @@ -446,7 +447,8 @@
621 # they aren't actually supported by this OS
622 SO_MAIN = $(LIBRARY).$(SO_VERSION).dll
623 SO_PLAIN = $(LIBRARY).$(VERSION).dll
624 - SO_OPTS += -shared
624 + SO_OPTS += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a 625 + SO_OPTS += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a
625 + INSTALL_SO = $(INSTALL)/bin 626 + INSTALL_SO = $(INSTALL)/bin
627 SO_INSTALL_NAME = echo
626 else 628 else
627 # Mac or Linux/Unix 629 # Mac or Linux/Unix
628 AR_TARGET = $(LIBRARY).a 630 @@ -568,6 +570,7 @@
629 @@ -550,6 +552,7 @@ config:
630 @echo 'System: UNAME= ' '$(UNAME)' 631 @echo 'System: UNAME= ' '$(UNAME)'
631 @echo 'Install directory: INSTALL= ' '$(INSTALL)' 632 @echo 'Install directory: INSTALL= ' '$(INSTALL)'
632 @echo 'Install libraries in: INSTALL_LIB= ' '$(INSTALL_LIB)' 633 @echo 'Install libraries in: INSTALL_LIB= ' '$(INSTALL_LIB)'
633 + @echo 'Install shared libs in: INSTALL_SO= ' '$(INSTALL_SO)' 634 + @echo 'Install shared libs in: INSTALL_SO= ' '$(INSTALL_SO)'
634 @echo 'Install include files in: INSTALL_INCLUDE=' '$(INSTALL_INCLUDE)' 635 @echo 'Install include files in: INSTALL_INCLUDE=' '$(INSTALL_INCLUDE)'
694 - $(RM) $(INSTALL_LIB)/$(SO_MAIN) 695 - $(RM) $(INSTALL_LIB)/$(SO_MAIN)
695 + $(RM) $(INSTALL_SO)/$(SO_TARGET) 696 + $(RM) $(INSTALL_SO)/$(SO_TARGET)
696 $(RM) $(INSTALL_INCLUDE)/umfpack*.h 697 $(RM) $(INSTALL_INCLUDE)/umfpack*.h
697 $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf 698 $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf
698 $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf 699 $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf
699 700 diff -urN SuiteSparse-5.11.0/Makefile.orig SuiteSparse-5.11.0/Makefile
700 --- a/Makefile 2019-12-22 12:17:36.147324000 +0100 701 --- SuiteSparse-5.11.0/Makefile.orig 2022-03-15 00:33:19.000000000 +0100
701 +++ b/Makefile 2019-12-22 12:23:59.027388353 +0100 702 +++ SuiteSparse-5.11.0/Makefile 2022-03-20 13:51:19.924606309 +0100
702 @@ -12,7 +12,6 @@ 703 @@ -16,7 +16,6 @@
703 # Compile the default rules for each package 704 # installs all libraries SuiteSparse/lib.
704 go: metis 705 go: metis
705 ( cd SuiteSparse_config && $(MAKE) ) 706 ( cd SuiteSparse_config && $(MAKE) )
706 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) 707 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
707 ( cd AMD && $(MAKE) ) 708 ( cd AMD && $(MAKE) )
708 ( cd BTF && $(MAKE) ) 709 ( cd BTF && $(MAKE) )
709 ( cd CAMD && $(MAKE) ) 710 ( cd CAMD && $(MAKE) )
710 @@ -38,7 +37,6 @@ 711 @@ -34,7 +33,6 @@
712 ( cd GPUQREngine && $(MAKE) )
713 endif
714 ( cd SPQR && $(MAKE) )
715 - ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
716 ( cd SLIP_LU && $(MAKE) )
717 # ( cd PIRO_BAND && $(MAKE) )
718 # ( cd SKYLINE_SVD && $(MAKE) )
719 @@ -44,9 +42,8 @@
720 # sudo make install INSTALL=/usr/local
721 # See SuiteSparse/README.md for more details.
711 # (note that CSparse is not installed; CXSparse is installed instead) 722 # (note that CSparse is not installed; CXSparse is installed instead)
712 install: metisinstall 723 -install: metisinstall gbinstall moninstall
724 +install: metisinstall
713 ( cd SuiteSparse_config && $(MAKE) install ) 725 ( cd SuiteSparse_config && $(MAKE) install )
714 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) 726 - # ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
715 ( cd AMD && $(MAKE) install ) 727 ( cd AMD && $(MAKE) install )
716 ( cd BTF && $(MAKE) install ) 728 ( cd BTF && $(MAKE) install )
717 ( cd CAMD && $(MAKE) install ) 729 ( cd CAMD && $(MAKE) install )
718 @@ -85,7 +83,6 @@ 730 @@ -63,7 +60,6 @@
731 ( cd GPUQREngine && $(MAKE) install )
732 endif
733 ( cd SPQR && $(MAKE) install )
734 - # ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
735 # ( cd PIRO_BAND && $(MAKE) install )
736 # ( cd SKYLINE_SVD && $(MAKE) install )
737 ( cd SLIP_LU && $(MAKE) install )
738 @@ -76,7 +72,7 @@
739 @mkdir -p $(INSTALL_LIB)
740 @mkdir -p $(INSTALL_INCLUDE)
741 @mkdir -p $(INSTALL_DOC)
742 - - $(CP) lib/libmetis.* $(INSTALL_SO)
743 + - $(CP) lib/libmetis.* $(INSTALL_SO)
744 - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf
745 - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt
746 # the following is needed only on the Mac, so *.dylib is hardcoded:
747 @@ -93,8 +89,6 @@
748 $(RM) $(INSTALL_DOC)/SuiteSparse_README.md
719 ( cd SuiteSparse_config && $(MAKE) uninstall ) 749 ( cd SuiteSparse_config && $(MAKE) uninstall )
720 - ( cd metis-5.1.0 && $(MAKE) uninstall ) 750 - ( cd metis-5.1.0 && $(MAKE) uninstall )
721 - ( cd GraphBLAS && $(MAKE) uninstall ) 751 - - ( cd GraphBLAS && $(MAKE) uninstall )
722 - - ( cd Mongoose && $(MAKE) uninstall ) 752 - - ( cd Mongoose && $(MAKE) uninstall )
723 ( cd AMD && $(MAKE) uninstall ) 753 ( cd AMD && $(MAKE) uninstall )
724 ( cd CAMD && $(MAKE) uninstall ) 754 ( cd CAMD && $(MAKE) uninstall )
725 ( cd COLAMD && $(MAKE) uninstall ) 755 ( cd COLAMD && $(MAKE) uninstall )
726 @@ -116,7 +113,6 @@ 756 @@ -126,7 +120,6 @@
727 # the static library 757 # the static library
728 library: metis 758 library: metis
729 ( cd SuiteSparse_config && $(MAKE) ) 759 ( cd SuiteSparse_config && $(MAKE) )
730 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) 760 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
731 ( cd AMD && $(MAKE) library ) 761 ( cd AMD && $(MAKE) library )
732 ( cd BTF && $(MAKE) library ) 762 ( cd BTF && $(MAKE) library )
733 ( cd CAMD && $(MAKE) library ) 763 ( cd CAMD && $(MAKE) library )
734 @@ -143,7 +139,6 @@ 764 @@ -144,7 +137,6 @@
765 ( cd GPUQREngine && $(MAKE) library )
766 endif
767 ( cd SPQR && $(MAKE) library )
768 - ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
769 ( cd SLIP_LU && $(MAKE) library )
770 # ( cd PIRO_BAND && $(MAKE) library )
771 # ( cd SKYLINE_SVD && $(MAKE) library )
772 @@ -154,7 +146,6 @@
735 # both the dynamic and static libraries. 773 # both the dynamic and static libraries.
736 static: metis 774 static: metis
737 ( cd SuiteSparse_config && $(MAKE) static ) 775 ( cd SuiteSparse_config && $(MAKE) static )
738 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) 776 - ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
739 ( cd AMD && $(MAKE) static ) 777 ( cd AMD && $(MAKE) static )
740 ( cd BTF && $(MAKE) static ) 778 ( cd BTF && $(MAKE) static )
741 ( cd CAMD && $(MAKE) static ) 779 ( cd CAMD && $(MAKE) static )
742 @@ -171,7 +166,6 @@ 780 @@ -172,7 +163,6 @@
781 ( cd GPUQREngine && $(MAKE) static )
782 endif
783 ( cd SPQR && $(MAKE) static )
784 - ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
785 ( cd SLIP_LU && $(MAKE) static )
786 # ( cd PIRO_BAND && $(MAKE) static )
787 # ( cd SKYLINE_SVD && $(MAKE) static )
788 @@ -182,8 +172,6 @@
789 - ( cd SuiteSparse_config && $(MAKE) purge )
743 - ( cd metis-5.1.0 && $(MAKE) distclean ) 790 - ( cd metis-5.1.0 && $(MAKE) distclean )
744 - ( cd AMD && $(MAKE) purge ) 791 - ( cd AMD && $(MAKE) purge )
745 - ( cd GraphBLAS && $(MAKE) purge ) 792 - - ( cd GraphBLAS && $(MAKE) purge )
746 - - ( cd Mongoose && $(MAKE) purge ) 793 - - ( cd Mongoose && $(MAKE) purge )
747 - ( cd CAMD && $(MAKE) purge ) 794 - ( cd CAMD && $(MAKE) purge )
748 - ( cd COLAMD && $(MAKE) purge ) 795 - ( cd COLAMD && $(MAKE) purge )
749 - ( cd BTF && $(MAKE) purge ) 796 - ( cd BTF && $(MAKE) purge )
750 @@ -198,7 +192,6 @@ 797 @@ -210,8 +198,6 @@
798 clean:
751 - ( cd SuiteSparse_config && $(MAKE) clean ) 799 - ( cd SuiteSparse_config && $(MAKE) clean )
752 - ( cd metis-5.1.0 && $(MAKE) clean ) 800 - ( cd metis-5.1.0 && $(MAKE) clean )
753 - ( cd GraphBLAS && $(MAKE) clean ) 801 - - ( cd GraphBLAS && $(MAKE) clean )
754 - - ( cd Mongoose && $(MAKE) clean ) 802 - - ( cd Mongoose && $(MAKE) clean )
755 - ( cd AMD && $(MAKE) clean ) 803 - ( cd AMD && $(MAKE) clean )
756 - ( cd CAMD && $(MAKE) clean ) 804 - ( cd CAMD && $(MAKE) clean )
757 - ( cd COLAMD && $(MAKE) clean ) 805 - ( cd COLAMD && $(MAKE) clean )
758 @@ -220,7 +213,6 @@ 806 @@ -233,8 +219,6 @@
807
759 # Create the PDF documentation 808 # Create the PDF documentation
760 docs: 809 docs:
761 ( cd GraphBLAS && $(MAKE) docs ) 810 - ( cd GraphBLAS && $(MAKE) docs )
762 - ( cd Mongoose && $(MAKE) docs ) 811 - ( cd Mongoose && $(MAKE) docs )
763 ( cd AMD && $(MAKE) docs ) 812 ( cd AMD && $(MAKE) docs )
764 ( cd CAMD && $(MAKE) docs ) 813 ( cd CAMD && $(MAKE) docs )
765 ( cd KLU && $(MAKE) docs ) 814 ( cd KLU && $(MAKE) docs )
766