diff --git a/superlu-examples_Makefile_remove_itersol.patch b/superlu-examples_Makefile_remove_itersol.patch new file mode 100644 index 0000000..2a28c2b --- /dev/null +++ b/superlu-examples_Makefile_remove_itersol.patch @@ -0,0 +1,115 @@ +--- EXAMPLE/Makefile 2019-02-08 09:57:41.220000000 +0100 ++++ EXAMPLE/Makefile.patched 2019-02-08 10:23:18.464000000 +0100 +@@ -40,8 +40,6 @@ + SLINXEXM1 = slinsolx1.o + SLINXEXM2 = slinsolx2.o + SLINXEXM3 = slinsolx3.o +-SITSOL = sitersol.o sfgmr.o +-SITSOL1 = sitersol1.o sfgmr.o + + DLINEXM = dlinsol.o + DLINEXM1 = dlinsol1.o +@@ -50,8 +48,6 @@ + DLINXEXM2 = dlinsolx2.o + DLINXEXM3 = dlinsolx3.o + SUPERLUEXM = superlu.o sp_ienv.o +-DITSOL = ditersol.o dfgmr.o +-DITSOL1 = ditersol1.o dfgmr.o + + CLINEXM = clinsol.o + CLINEXM1 = clinsol1.o +@@ -59,8 +55,6 @@ + CLINXEXM1 = clinsolx1.o + CLINXEXM2 = clinsolx2.o + CLINXEXM3 = clinsolx3.o +-CITSOL = citersol.o cfgmr.o +-CITSOL1 = citersol1.o cfgmr.o + + ZLINEXM = zlinsol.o + ZLINEXM1 = zlinsol1.o +@@ -68,20 +62,17 @@ + ZLINXEXM1 = zlinsolx1.o + ZLINXEXM2 = zlinsolx2.o + ZLINXEXM3 = zlinsolx3.o +-ZITSOL = zitersol.o zfgmr.o +-ZITSOL1 = zitersol1.o zfgmr.o + + + all: single double complex complex16 + +-single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 slinsolx3 \ +- sitersol sitersol1 ++single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 slinsolx3 ++ + double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 dlinsolx3 \ +- superlu ditersol ditersol1 +-complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 clinsolx3 \ +- citersol citersol1 +-complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zlinsolx3 \ +- zitersol zitersol1 ++ superlu ++complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 clinsolx3 ++ ++complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zlinsolx3 + + slinsol: $(SLINEXM) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@ +@@ -101,11 +92,6 @@ + slinsolx3: $(SLINXEXM3) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@ + +-sitersol: $(SITSOL) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@ +- +-sitersol1: $(SITSOL1) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@ + + dlinsol: $(DLINEXM) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@ +@@ -128,12 +114,6 @@ + superlu: $(SUPERLUEXM) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@ + +-ditersol: $(DITSOL) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@ +- +-ditersol1: $(DITSOL1) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@ +- + clinsol: $(CLINEXM) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@ + +@@ -152,12 +132,6 @@ + clinsolx3: $(CLINXEXM3) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@ + +-citersol: $(CITSOL) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@ +- +-citersol1: $(CITSOL1) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) -lm -o $@ +- + zlinsol: $(ZLINEXM) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@ + +@@ -176,11 +150,6 @@ + zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB) + $(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@ + +-zitersol: $(ZITSOL) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@ +- +-zitersol1: $(ZITSOL1) $(SUPERLULIB) +- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@ + + .c.o: + $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE) +@@ -190,7 +159,7 @@ + + clean: + rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \ +- superlu *itersol *itersol1 ++ superlu + + + diff --git a/superlu-make.linux.patch b/superlu-make.linux.patch new file mode 100644 index 0000000..6fccfad --- /dev/null +++ b/superlu-make.linux.patch @@ -0,0 +1,13 @@ +--- MAKE_INC/make.linux 2016-05-22 17:58:44.000000000 +0200 ++++ MAKE_INC/make.linux.patched 2019-02-08 10:35:38.740265921 +0100 +@@ -21,8 +21,8 @@ + # + # The name of the libraries to be created/linked to + # +-SuperLUroot = $(HOME)/Dropbox/Codes/SuperLU/SuperLU +-SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_5.1.a ++SuperLUroot = /usr ++SUPERLULIB = /usr/lib/hpc/gnu7/superlu/5.?.?/lib64/libsuperlu.so + + #BLASLIB = $(SuperLUroot)/lib/libblas.a + diff --git a/superlu.changes b/superlu.changes index 5e28412..24d57af 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 8 09:40:33 UTC 2019 - Antoine Ginies + +- get a buildable examples test suite (bsc#1124765) + fixing Makefile + adding missing make.inc + ------------------------------------------------------------------- Tue Jan 22 11:58:01 UTC 2019 - eich@suse.com diff --git a/superlu.spec b/superlu.spec index a3344d1..98d24e9 100644 --- a/superlu.spec +++ b/superlu.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -76,6 +76,8 @@ Patch2: superlu-4.3-dont-opt-away.diff # from the original sources for legal reasons. This patch disables the inclusion of # this routine in the library which, however, remains fully functional Patch3: superlu-5.2-remove-mc64ad.patch +Patch4: superlu-examples_Makefile_remove_itersol.patch +Patch5: superlu-make.linux.patch URL: http://crd.lbl.gov/~xiaoye/SuperLU/ BuildRequires: cmake >= 2.8.12 BuildRequires: fdupes @@ -148,6 +150,8 @@ decomposition of sparse matrices. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p0 +%patch5 -p0 cp %SOURCE1 %SOURCE2 ./ # Create baselibs.conf dynamically (non-HPC build only). %if %{without hpc} @@ -178,6 +182,7 @@ make clean rm -rf *itersol* .gitignore cd .. mv EXAMPLE examples +cp MAKE_INC/make.linux make.inc rm -f examples/.gitignore cp FORTRAN/README README.fortran %fdupes -s examples