[superlu] 01/02: simplify debian/, use cmake installation
Nico Schlömer
nschloe-guest at moszumanska.debian.org
Thu May 19 23:50:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
nschloe-guest pushed a commit to branch master
in repository superlu.
commit a402e673a7ba6597d626a3758a343889019a7924
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date: Fri May 20 00:30:02 2016 +0200
simplify debian/, use cmake installation
---
debian/control | 17 +-
debian/libsuperlu-dev.install | 7 +-
debian/libsuperlu4.install | 4 -
debian/libsuperlu5.install | 1 +
debian/patches/Makefile.patch | 364 -----------------------------------
debian/patches/format-security.patch | 13 --
debian/patches/series | 4 +-
debian/rules | 43 +----
debian/runtests.sh | 16 --
9 files changed, 22 insertions(+), 447 deletions(-)
diff --git a/debian/control b/debian/control
index 79fed6b..0f2ab23 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,17 @@ Priority: optional
Section: devel
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas.so,
- dh-exec
+Build-Depends: debhelper (>= 9),
+ gcc (>= 3.0),
+ gfortran,
+ cmake,
+ libblas-dev
Standards-Version: 3.9.5
Homepage: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/superlu/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk
-Package: libsuperlu4
+Package: libsuperlu5
Section: libs
Architecture: any
Multi-Arch: same
@@ -37,9 +40,9 @@ Package: libsuperlu-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libsuperlu4 (= ${binary:Version}), libblas-dev, ${misc:Depends}
+Depends: libsuperlu5 (= ${binary:Version}), libblas-dev, ${misc:Depends}
Suggests: libsuperlu-doc
-Conflicts: libsuperlu3-dev
+Conflicts: libsuperlu4-dev, libsuperlu3-dev
Description: Direct solution of large, sparse systems of linear equations
Development files for SuperLU.
.
@@ -59,12 +62,12 @@ Description: Direct solution of large, sparse systems of linear equations
the relative backward error, and estimate error bounds for the refined
solutions.
-Package: libsuperlu4-dbg
+Package: libsuperlu5-dbg
Priority: extra
Section: debug
Architecture: any
Multi-Arch: same
-Depends: libsuperlu4 (= ${binary:Version}), ${misc:Depends}
+Depends: libsuperlu5 (= ${binary:Version}), ${misc:Depends}
Description: Direct solution of large, sparse systems of linear equations
Debug files for SuperLU.
.
diff --git a/debian/libsuperlu-dev.install b/debian/libsuperlu-dev.install
old mode 100755
new mode 100644
index 8b3c7d9..f3800aa
--- a/debian/libsuperlu-dev.install
+++ b/debian/libsuperlu-dev.install
@@ -1,5 +1,2 @@
-#!/usr/bin/dh-exec
-
-libsuperlu.so /usr/lib/${DEB_HOST_MULTIARCH}/
-libsuperlu.a /usr/lib/${DEB_HOST_MULTIARCH}/
-SRC/*.h /usr/include/superlu
+usr/include/*
+usr/lib/*/lib*.so
diff --git a/debian/libsuperlu4.install b/debian/libsuperlu4.install
deleted file mode 100755
index 45a1ba6..0000000
--- a/debian/libsuperlu4.install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/dh-exec
-
-libsuperlu.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
-README /usr/share/doc/libsuperlu4
diff --git a/debian/libsuperlu5.install b/debian/libsuperlu5.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libsuperlu5.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
deleted file mode 100644
index 8c1177c..0000000
--- a/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,364 +0,0 @@
---- a/EXAMPLE/Makefile
-+++ b/EXAMPLE/Makefile
-@@ -33,14 +33,13 @@
- #######################################################################
-
- HEADER = ../SRC
-+LIBS = ../$(SUPERLULIB) $(BLASLIB) -lm
-
- SLINEXM = slinsol.o
- SLINEXM1 = slinsol1.o
- SLINXEXM = slinsolx.o
- SLINXEXM1 = slinsolx1.o
- SLINXEXM2 = slinsolx2.o
--SITSOL = sitersol.o sfgmr.o
--SITSOL1 = sitersol1.o sfgmr.o
-
- DLINEXM = dlinsol.o
- DLINEXM1 = dlinsol1.o
-@@ -48,130 +47,95 @@
- DLINXEXM1 = dlinsolx1.o
- DLINXEXM2 = dlinsolx2.o
- SUPERLUEXM = superlu.o sp_ienv.o
--DITSOL = ditersol.o dfgmr.o
--DITSOL1 = ditersol1.o dfgmr.o
-
- CLINEXM = clinsol.o
- CLINEXM1 = clinsol1.o
- CLINXEXM = clinsolx.o
- CLINXEXM1 = clinsolx1.o
- CLINXEXM2 = clinsolx2.o
--CITSOL = citersol.o cfgmr.o
--CITSOL1 = citersol1.o cfgmr.o
-
- ZLINEXM = zlinsol.o
- ZLINEXM1 = zlinsol1.o
- ZLINXEXM = zlinsolx.o
- ZLINXEXM1 = zlinsolx1.o
- ZLINXEXM2 = zlinsolx2.o
--ZITSOL = zitersol.o zfgmr.o
--ZITSOL1 = zitersol1.o zfgmr.o
-
-
- all: single double complex complex16
-
--single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 sitersol sitersol1
--double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 superlu \
-- ditersol ditersol1
--complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 citersol citersol1
--complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zitersol zitersol1
-+single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2
-+double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 superlu
-+complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2
-+complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2
-
--slinsol: $(SLINEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
-+slinsol: $(SLINEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -o $@
-
--slinsol1: $(SLINEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -lm -o $@
-+slinsol1: $(SLINEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SLINEXM1) $(LIBS) -o $@
-
--slinsolx: $(SLINXEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -lm -o $@
-+slinsolx: $(SLINXEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SLINXEXM) $(LIBS) -o $@
-
--slinsolx1: $(SLINXEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -lm -o $@
-+slinsolx1: $(SLINXEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SLINXEXM1) $(LIBS) -o $@
-
--slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -lm -o $@
-+slinsolx2: $(SLINXEXM2) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SLINXEXM2) $(LIBS) -o $@
-
--sitersol: $(SITSOL) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
-+dlinsol: $(DLINEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -o $@
-
--sitersol1: $(SITSOL1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@
-+dlinsol1: $(DLINEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -o $@
-
--dlinsol: $(DLINEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
-+dlinsolx: $(DLINXEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -o $@
-
--dlinsol1: $(DLINEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DLINEXM1) $(LIBS) -lm -o $@
-+dlinsolx1: $(DLINXEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -o $@
-
--dlinsolx: $(DLINXEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DLINXEXM) $(LIBS) -lm -o $@
-+dlinsolx2: $(DLINXEXM2) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -o $@
-
--dlinsolx1: $(DLINXEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DLINXEXM1) $(LIBS) -lm -o $@
-+superlu: $(SUPERLUEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -o $@
-
--dlinsolx2: $(DLINXEXM2) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DLINXEXM2) $(LIBS) -lm -o $@
-+clinsol: $(CLINEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -o $@
-
--superlu: $(SUPERLUEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
-+clinsol1: $(CLINEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -o $@
-
--ditersol: $(DITSOL) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
-+clinsolx: $(CLINXEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -o $@
-
--ditersol1: $(DITSOL1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@
-+clinsolx1: $(CLINXEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -o $@
-
--clinsol: $(CLINEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
-+clinsolx2: $(CLINXEXM2) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -o $@
-
--clinsol1: $(CLINEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(CLINEXM1) $(LIBS) -lm -o $@
-+zlinsol: $(ZLINEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -o $@
-
--clinsolx: $(CLINXEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(CLINXEXM) $(LIBS) -lm -o $@
-+zlinsol1: $(ZLINEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -o $@
-
--clinsolx1: $(CLINXEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(CLINXEXM1) $(LIBS) -lm -o $@
-+zlinsolx: $(ZLINXEXM) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -o $@
-
--clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(CLINXEXM2) $(LIBS) -lm -o $@
-+zlinsolx1: $(ZLINXEXM1) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -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 $@
--
--zlinsol1: $(ZLINEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZLINEXM1) $(LIBS) -lm -o $@
--
--zlinsolx: $(ZLINXEXM) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZLINXEXM) $(LIBS) -lm -o $@
--
--zlinsolx1: $(ZLINXEXM1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZLINXEXM1) $(LIBS) -lm -o $@
--
--zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -lm -o $@
--
--zitersol: $(ZITSOL) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
--
--zitersol1: $(ZITSOL1) $(SUPERLULIB)
-- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@
-+zlinsolx2: $(ZLINXEXM2) ../$(SUPERLULIB)
-+ $(LOADER) $(LOADOPTS) $(ZLINXEXM2) $(LIBS) -o $@
-
- .c.o:
-- $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE)
-+ $(CC) $(CFLAGS) -I$(HEADER) -c $< $(VERBOSE)
-
- .f.o:
- $(FORTRAN) $(FFLAGS) -c $< $(VERBOSE)
-
- clean:
-- rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
-- superlu *itersol
--
--
--
-+ rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 superlu
---- a/Makefile
-+++ b/Makefile
-@@ -44,9 +44,6 @@
- testing:
- ( cd TESTING ; $(MAKE) )
-
--doc:
-- doxygen Doxyfile
--
- cleanlib:
- ( cd SRC; $(MAKE) clean )
- ( cd TESTING/MATGEN; $(MAKE) clean )
---- a/SRC/Makefile
-+++ b/SRC/Makefile
-@@ -114,24 +114,24 @@
- all: single double complex complex16
-
- single: $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
-- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
-+ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
- $(SLUSRC) $(ALLAUX) $(LAAUX) $(SLASRC) $(SCLAUX)
-- $(RANLIB) $(SUPERLULIB)
-+ $(RANLIB) ../$(SUPERLULIB)
-
- double: $(DLUSRC) $(ALLAUX) $(LAAUX) $(DLASRC) $(DZLAUX)
-- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
-+ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
- $(DLUSRC) $(ALLAUX) $(LAAUX) $(DLASRC) $(DZLAUX)
-- $(RANLIB) $(SUPERLULIB)
-+ $(RANLIB) ../$(SUPERLULIB)
-
- complex: $(CLUSRC) $(ALLAUX) $(LAAUX) $(CLASRC) $(SCLAUX)
-- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
-+ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
- $(CLUSRC) $(ALLAUX) $(LAAUX) $(CLASRC) $(SCLAUX)
-- $(RANLIB) $(SUPERLULIB)
-+ $(RANLIB) ../$(SUPERLULIB)
-
- complex16: $(ZLUSRC) $(ALLAUX) $(LAAUX) $(ZLASRC) $(DZLAUX)
-- $(ARCH) $(ARCHFLAGS) $(SUPERLULIB) \
-+ $(ARCH) $(ARCHFLAGS) ../$(SUPERLULIB) \
- $(ZLUSRC) $(ALLAUX) $(LAAUX) $(ZLASRC) $(DZLAUX)
-- $(RANLIB) $(SUPERLULIB)
-+ $(RANLIB) ../$(SUPERLULIB)
-
-
- ##################################
-@@ -145,8 +145,5 @@
- .c.o:
- $(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
-
--.f.o:
-- $(FORTRAN) $(FFLAGS) -c $<
--
- clean:
-- rm -f *.o $(SUPERLULIB)
-+ rm -f *.o libsuperlu.*
---- a/make.inc
-+++ b/make.inc
-@@ -16,26 +16,14 @@
- #
- # The machine (platform) identifier to append to the library names
- #
--PLAT = _linux
-+PLAT =
-
- #
- # The name of the libraries to be created/linked to
- #
--SuperLUroot = $(HOME)/Codes/SuperLU/SuperLU_4.3
--SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a
--TMGLIB = libtmglib.a
--
--## BLASLIB = $(SuperLUroot)/lib/libblas.a
--
--BLASDEF = -DUSE_VENDOR_BLAS
--BLASLIB = -L$(HOME)/lib/GotoBLAS -lgoto
--
--## ATLAS BLAS causes single-precision to fail
--#BLASLIB = -L/usr/lib/atlas -lblas
--## This BLAS causes single-precision to fail the test in SuperLU
--#BLASLIB = -L/usr/lib -lblas
--
--LIBS = $(SUPERLULIB) $(BLASLIB)
-+TMGLIB = libtmglib$(PLAT).a
-+SUPERLULIB = libsuperlu$(PLAT).a
-+BLASLIB = -lblas
-
- #
- # The archiver and the flag(s) to use when building archive (library)
-@@ -46,20 +34,17 @@
- RANLIB = ranlib
-
- CC = gcc
--CFLAGS = -DPRNTlevel=0 -O3
--NOOPTS =
-+CFLAGS = -O2
- FORTRAN = g77
--FFLAGS = -O2
--LOADER = $(CC)
--LOADOPTS =
-+FFLAGS = -O
-+LOADER = gcc
-+LOADOPTS =
-
- #
--# C preprocessor defs for compilation for the Fortran interface
--# (-DNoChange, -DAdd_, -DAdd__, or -DUpCase)
-+# C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)
- #
- CDEFS = -DAdd_
- #
- # The directory in which Matlab is installed
- #
--MATLAB = /usr/sww/matlab
--
-+MATLAB = /opt/matlab
---- a/TESTING/Makefile
-+++ b/TESTING/Makefile
-@@ -52,9 +52,9 @@
-
- single: ./stest stest.out
-
--./stest: $(SLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
-+./stest: $(SLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
- $(LOADER) $(LOADOPTS) $(SLINTST) $(ALINTST) \
-- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
-+ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
-
- stest.out: stest stest.csh
- @echo Testing SINGLE PRECISION linear equation routines
-@@ -62,9 +62,9 @@
-
- double: ./dtest dtest.out
-
--./dtest: $(DLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
-+./dtest: $(DLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
- $(LOADER) $(LOADOPTS) $(DLINTST) $(ALINTST) \
-- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
-+ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
-
- dtest.out: dtest dtest.csh
- @echo Testing DOUBLE PRECISION linear equation routines
-@@ -72,9 +72,9 @@
-
- complex: ./ctest ctest.out
-
--./ctest: $(CLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
-+./ctest: $(CLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
- $(LOADER) $(LOADOPTS) $(CLINTST) $(ALINTST) \
-- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
-+ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
-
- ctest.out: ctest ctest.csh
- @echo Testing SINGLE COMPLEX linear equation routines
-@@ -82,9 +82,9 @@
-
- complex16: ./ztest ztest.out
-
--./ztest: $(ZLINTST) $(ALINTST) $(SUPERLULIB) $(TMGLIB)
-+./ztest: $(ZLINTST) $(ALINTST) ../$(SUPERLULIB) $(TMGLIB)
- $(LOADER) $(LOADOPTS) $(ZLINTST) $(ALINTST) \
-- $(TMGLIB) $(SUPERLULIB) $(BLASLIB) -lm -o $@
-+ $(TMGLIB) ../$(SUPERLULIB) $(BLASLIB) -lm -o $@
-
- ztest.out: ztest ztest.csh
- @echo Testing DOUBLE COMPLEX linear equation routines
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
deleted file mode 100644
index b5b5de6..0000000
--- a/debian/patches/format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: superlu-4.3/SRC/util.c
-===================================================================
---- superlu-4.3.orig/SRC/util.c 2011-10-27 21:49:47.000000000 +0200
-+++ superlu-4.3/SRC/util.c 2012-06-29 16:51:29.000000000 +0200
-@@ -29,7 +29,7 @@
-
- void superlu_abort_and_exit(char* msg)
- {
-- fprintf(stderr, msg);
-+ fprintf(stderr, "%s", msg);
- exit (-1);
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index cfa7657..7fb8f29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-format-security.patch
-Makefile.patch
-mc64ad-stub.patch
+#mc64ad-stub.patch
diff --git a/debian/rules b/debian/rules
index 5723b65..560f407 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,45 +4,18 @@
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
-%:
- dh $@ --parallel
-
-#include /usr/share/hardening-includes/hardening.make
-#
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#CFLAGS+=$(HARDENING_CFLAGS)
-#LDFLAGS+=$(HARDENING_LDFLAGS)
-
-# shared library versions, option 1
-version=4.0.0
-major=4
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-override_dh_auto_build:
- # Build shared library
- cd SRC && $(MAKE) NOOPTS="-fPIC" CFLAGS="$(CFLAGS) -fPIC -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="$(LDFLAGS)"
- cd SRC && gcc -shared $(LDFLAGS) -Wl,-soname,libsuperlu.so.$(major) -o ../libsuperlu.so.$(version) `ls *.o` -lblas -lm
- ln -sf libsuperlu.so.$(version) libsuperlu.so.$(major)
- ln -sf libsuperlu.so.$(version) libsuperlu.so
- # Build static library
- cd SRC && $(MAKE) clean
- rm -f libsuperlu.a
- cd SRC && $(MAKE) CFLAGS="$(CFLAGS) -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="$(LDFLAGS) -s"
-
-# Do not run "make install": we don't need it and it is not parallel safe
-override_dh_auto_install:
-
-override_dh_auto_clean:
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f libsuperlu.a libsuperlu.so*
+%:
+ dh $@ --parallel --buildsystem=cmake
-override_dh_strip:
- dh_strip --dbg-package=libsuperlu4-dbg
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -Denable_blaslib:BOOL=OFF
-override_dh_auto_test:
- cd TESTING && $(MAKE)
DEB_SOURCE_PACKAGE = superlu
DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
diff --git a/debian/runtests.sh b/debian/runtests.sh
deleted file mode 100644
index b01be12..0000000
--- a/debian/runtests.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-# set -x
-if test ! -z $1; then
- test -d $1 && cp -r /usr/share/doc/libsuperlu-dev/tests $1
- cp -r /usr/share/doc/libsuperlu-dev/examples $1/EXAMPLE
- gunzip $1/EXAMPLE/g10.gz
- cp /usr/share/doc/libsuperlu-dev/make.inc $1
- cd $1/tests/MATGEN
- make CFLAGS="-I/usr/include/superlu"
- cd $1/tests/
- make CFLAGS="-I/usr/include/superlu"
- cd $1/EXAMPLE/
- make CFLAGS="-I/usr/include/superlu"
-else
- echo "usage: $0 <test directory>"
-fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/superlu.git
More information about the debian-science-commits
mailing list