Last active
November 4, 2019 07:15
-
-
Save samm-git/5888df062a33554e35b52a239e255d87 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur SuiteSparse/Makefile SuiteSparse.new/Makefile | |
--- Makefile 2018-12-23 14:31:36.000000000 +0100 | |
+++ Makefile 2019-11-04 07:40:33.000000000 +0100 | |
@@ -38,24 +38,24 @@ | |
# (note that CSparse is not installed; CXSparse is installed instead) | |
install: metisinstall | |
( cd SuiteSparse_config && $(MAKE) install ) | |
- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) | |
- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) | |
+# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) | |
+# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) | |
( cd AMD && $(MAKE) install ) | |
- ( cd BTF && $(MAKE) install ) | |
+# ( cd BTF && $(MAKE) install ) | |
( cd CAMD && $(MAKE) install ) | |
( cd CCOLAMD && $(MAKE) install ) | |
( cd COLAMD && $(MAKE) install ) | |
( cd CHOLMOD && $(MAKE) install ) | |
- ( cd CXSparse && $(MAKE) install ) | |
- ( cd LDL && $(MAKE) install ) | |
- ( cd KLU && $(MAKE) install ) | |
+# ( cd CXSparse && $(MAKE) install ) | |
+# ( cd LDL && $(MAKE) install ) | |
+# ( cd KLU && $(MAKE) install ) | |
( cd UMFPACK && $(MAKE) install ) | |
- ( cd RBio && $(MAKE) install ) | |
+# ( cd RBio && $(MAKE) install ) | |
ifneq (,$(GPU_CONFIG)) | |
( cd SuiteSparse_GPURuntime && $(MAKE) install ) | |
( cd GPUQREngine && $(MAKE) install ) | |
endif | |
- ( cd SPQR && $(MAKE) install ) | |
+# ( cd SPQR && $(MAKE) install ) | |
# ( cd PIRO_BAND && $(MAKE) install ) | |
# ( cd SKYLINE_SVD && $(MAKE) install ) | |
$(CP) README.txt $(INSTALL_DOC)/SuiteSparse_README.txt | |
@@ -71,7 +71,7 @@ | |
- $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf | |
- $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt | |
# the following is needed only on the Mac, so *.dylib is hardcoded: | |
- $(SO_INSTALL_NAME) $(INSTALL_LIB)/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib | |
+ $(SO_INSTALL_NAME) $(PREFIX)/lib/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib | |
- $(CP) include/metis.h $(INSTALL_INCLUDE) | |
chmod 755 $(INSTALL_LIB)/libmetis.* | |
chmod 644 $(INSTALL_INCLUDE)/metis.h | |
@@ -116,25 +116,25 @@ | |
# the static library | |
library: metis | |
( cd SuiteSparse_config && $(MAKE) ) | |
- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) | |
- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) | |
+# ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) | |
+# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) | |
( cd AMD && $(MAKE) library ) | |
- ( cd BTF && $(MAKE) library ) | |
+# ( cd BTF && $(MAKE) library ) | |
( cd CAMD && $(MAKE) library ) | |
( cd CCOLAMD && $(MAKE) library ) | |
( cd COLAMD && $(MAKE) library ) | |
( cd CHOLMOD && $(MAKE) library ) | |
- ( cd KLU && $(MAKE) library ) | |
- ( cd LDL && $(MAKE) library ) | |
+# ( cd KLU && $(MAKE) library ) | |
+# ( cd LDL && $(MAKE) library ) | |
( cd UMFPACK && $(MAKE) library ) | |
( cd CSparse && $(MAKE) library ) | |
- ( cd CXSparse && $(MAKE) library ) | |
- ( cd RBio && $(MAKE) library ) | |
+# ( cd CXSparse && $(MAKE) library ) | |
+# ( cd RBio && $(MAKE) library ) | |
ifneq (,$(GPU_CONFIG)) | |
( cd SuiteSparse_GPURuntime && $(MAKE) library ) | |
( cd GPUQREngine && $(MAKE) library ) | |
endif | |
- ( cd SPQR && $(MAKE) library ) | |
+# ( cd SPQR && $(MAKE) library ) | |
# ( cd PIRO_BAND && $(MAKE) library ) | |
# ( cd SKYLINE_SVD && $(MAKE) library ) | |
diff -ur SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk SuiteSparse.new/SuiteSparse_config/SuiteSparse_config.mk | |
--- SuiteSparse_config/SuiteSparse_config.mk 2018-12-23 04:15:58.000000000 +0100 | |
+++ SuiteSparse_config/SuiteSparse_config.mk 2019-11-04 07:39:16.000000000 +0100 | |
@@ -463,7 +463,8 @@ | |
SO_TARGET = $(LIBRARY).$(VERSION).dylib | |
SO_OPTS += -dynamiclib -compatibility_version $(SO_VERSION) \ | |
-current_version $(VERSION) \ | |
- -shared -undefined dynamic_lookup | |
+ -shared -undefined dynamic_lookup \ | |
+ -install_name $(PREFIX)/lib/$(SO_MAIN) | |
# When a Mac *.dylib file is moved, this command is required | |
# to change its internal name to match its location in the filesystem: | |
SO_INSTALL_NAME = install_name_tool -id | |
@@ -533,7 +533,7 @@ | |
ifneq (, $(wildcard $(SUITESPARSE)/metis-5.1.0)) | |
# SuiteSparse/metis5.1.0 is available | |
ifeq ($(UNAME), Darwin) | |
- LIB_WITH_PARTITION += $(SUITESPARSE)/lib/libmetis.dylib | |
+ LIB_WITH_PARTITION += -lmetis | |
else | |
LIB_WITH_PARTITION += -lmetis | |
endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment