r44813 - in /packages/pastix/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed May 16 15:45:32 UTC 2012
Author: trophime-guest
Date: Wed May 16 15:45:32 2012
New Revision: 44813
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44813
Log:
update to 5.2
Added:
packages/pastix/trunk/debian/README.source
packages/pastix/trunk/debian/config-shared.in
packages/pastix/trunk/debian/config.in
packages/pastix/trunk/debian/libpastix-doc.doc-base.refcard
packages/pastix/trunk/debian/libpastix-doc.install
packages/pastix/trunk/debian/pastix-bin.install
packages/pastix/trunk/debian/patches/Makefile.patch
packages/pastix/trunk/debian/patches/sharedlibrary.patch
Modified:
packages/pastix/trunk/debian/README.Debian
packages/pastix/trunk/debian/changelog
packages/pastix/trunk/debian/control
packages/pastix/trunk/debian/copyright
packages/pastix/trunk/debian/docs
packages/pastix/trunk/debian/libpastix-dev.install
packages/pastix/trunk/debian/libpastix1.install
packages/pastix/trunk/debian/patches/series
packages/pastix/trunk/debian/rules
Modified: packages/pastix/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/README.Debian?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/README.Debian (original)
+++ packages/pastix/trunk/debian/README.Debian Wed May 16 15:45:32 2012
@@ -1,3 +1,6 @@
-PaStiX for Debian
+pastix for Debian
-----------------
+initial build for squeeze
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Wed, 13 Oct 2010 11:26:21 +0200
Added: packages/pastix/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/README.source?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/README.source (added)
+++ packages/pastix/trunk/debian/README.source Wed May 16 15:45:32 2012
@@ -1,0 +1,9 @@
+pastix for Debian
+-----------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
Modified: packages/pastix/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/changelog?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/changelog (original)
+++ packages/pastix/trunk/debian/changelog Wed May 16 15:45:32 2012
@@ -1,6 +1,9 @@
-pastix (3184-1) unstable; urgency=low
+pastix (5.2-1) unstable; urgency=low
- * initial version
+ * New upstream release
+ * Use release 3688
- -- Pierre Saramito <pierre.saramito at imag.fr> Thu, 26 March 2011 08:10:11 +0200
+ [Pierre Saramito]
+ * Initial release (Closes: #nnnn)
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Thu, 10 May 2012 11:33:05 +0200
Added: packages/pastix/trunk/debian/config-shared.in
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/config-shared.in?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/config-shared.in (added)
+++ packages/pastix/trunk/debian/config-shared.in Wed May 16 15:45:32 2012
@@ -1,0 +1,229 @@
+HOSTARCH = i686_pc_linux
+VERSIONBIT =
+EXEEXT =
+OBJEXT = .o
+SOEXT = .so
+SOVERSION = .1.0
+SOVER = .1
+LIBEXT = .a
+CCPROG = gcc -Wall
+CFPROG = gfortran
+CF90PROG = gfortran -ffree-form
+MCFPROG = mpif90
+CF90CCPOPT = -ffree-form -x f95-cpp-input
+# Compilation options for optimization (make expor)
+CCFOPT = -O3
+# Compilation options for debug (make | make debug)
+CCFDEB = -g3
+
+LKFOPT =
+MKPROG = make
+MPCCPROG = mpicc -Wall
+CPP = cpp
+ARFLAGS = ruv
+ARPROG = ar
+EXTRALIB = -lgfortran -lm -lrt
+
+VERSIONMPI = _mpi
+VERSIONSMP = _smp
+VERSIONSCH = _static
+VERSIONINT = _int
+VERSIONPRC = _simple
+VERSIONFLT = _real
+VERSIONORD = _scotch
+
+###################################################################
+# SETTING INSTALL DIRECTORIES #
+###################################################################
+# ROOT = /path/to/install/directory
+# INCLUDEDIR = ${ROOT}/include
+# LIBDIR = ${ROOT}/lib
+# BINDIR = ${ROOT}/bin
+
+###################################################################
+# SHARED LIBRARY GENERATION #
+###################################################################
+SHARED=1
+SHARED_FLAGS = -shared
+CCFDEB := ${CCFDEB} -fPIC
+CCFOPT := ${CCFOPT} -fPIC
+CFPROG := ${CFPROG} -fPIC
+
+###################################################################
+# INTEGER TYPE #
+###################################################################
+# Uncomment the following lines for integer type support (Only 1)
+
+#VERSIONINT = _long
+#CCTYPES = -DFORCE_LONG -DLONG
+#---------------------------
+#VERSIONINT = _int32
+#CCTYPES = -DFORCE_INT32 -DINTSIZE32
+#---------------------------
+#VERSIONINT = _int64
+#CCTYPES = -DFORCE_INT64 -DINTSSIZE64
+
+###################################################################
+# FLOAT TYPE #
+###################################################################
+CCTYPESFLT =
+# Uncomment the following lines for double precision support
+VERSIONPRC = _double
+CCTYPESFLT := $(CCTYPESFLT) -DFORCE_DOUBLE -DPREC_DOUBLE
+
+# Uncomment the following lines for float=complex support
+#VERSIONFLT = _complex
+#CCTYPESFLT := $(CCTYPESFLT) -DFORCE_COMPLEX -DTYPE_COMPLEX
+
+
+###################################################################
+# MPI/THREADS #
+###################################################################
+
+# Uncomment the following lines for sequential (NOMPI) version
+#VERSIONMPI = _nompi
+#CCTYPES := $(CCTYPES) -DFORCE_NOMPI
+#MPCCPROG = $(CCPROG)
+#MCFPROG = $(CFPROG)
+
+# Uncomment the following lines for non-threaded (NOSMP) version
+#VERSIONSMP = _nosmp
+#CCTYPES := $(CCTYPES) -DFORCE_NOSMP
+
+# Uncomment the following line to enable a progression thread
+#CCPASTIX := $(CCPASTIX) -DTHREAD_COMM
+
+# Uncomment the following line if your MPI doesn't support MPI_THREAD_MULTIPLE level
+#CCPASTIX := $(CCPASTIX) -DPASTIX_FUNNELED
+
+# Uncomment the following line if your MPI doesn't support MPI_Datatype correctly
+#CCPASTIX := $(CCPASTIX) -DNO_MPI_TYPE
+
+# Uncomment the following line if you want to use semaphore barrier
+# instead of MPI barrier (with IPARM_AUTOSPLIT_COMM)
+#CCPASTIX := $(CCPASTIX) -DWITH_SEM_BARRIER
+
+# Uncomment the following lines to enable StarPU.
+#CCPASTIX := ${CCPASTIX} `pkg-config libstarpu --cflags` -DWITH_STARPU
+#EXTRALIB := $(EXTRALIB) `pkg-config libstarpu --libs`
+
+# Uncomment the following line to enable StarPU profiling
+# ( IPARM_VERBOSE > API_VERBOSE_NO ).
+#CCPASTIX := ${CCPASTIX} -DSTARPU_PROFILING
+
+# Uncomment the following line to disable CUDA (StarPU)
+#CCPASTIX := ${CCPASTIX} -DFORCE_NO_CUDA
+
+###################################################################
+# Options #
+###################################################################
+
+# Show memory usage statistics
+#CCPASTIX := $(CCPASTIX) -DMEMORY_USAGE
+
+# Show memory usage statistics in solver
+#CCPASTIX := $(CCPASTIX) -DSTATS_SOPALIN
+
+# Uncomment following line for dynamic thread scheduling support
+#CCPASTIX := $(CCPASTIX) -DPASTIX_DYNSCHED
+
+# Uncomment the following lines for Out-of-core
+#CCPASTIX := $(CCPASTIX) -DOOC -DOOC_NOCOEFINIT -DOOC_DETECT_DEADLOCKS
+
+###################################################################
+# GRAPH PARTITIONING #
+###################################################################
+
+# Uncomment the following lines for using metis ordering
+#VERSIONORD = _metis
+#METIS_HOME = ${HOME}/metis-4.0
+#CCPASTIX := $(CCPASTIX) -DMETIS -I$(METIS_HOME)/Lib
+#EXTRALIB := $(EXTRALIB) -L$(METIS_HOME) -lmetis
+
+# Scotch always needed to compile
+SCOTCH_HOME ?=
+SCOTCH_INC = /usr/include/scotch
+SCOTCH_LIB = /usr/lib
+# Uncomment on of this blocks
+#scotch
+CCPASTIX := $(CCPASTIX) -I$(SCOTCH_INC) -DWITH_SCOTCH
+EXTRALIB := $(EXTRALIB) -L$(SCOTCH_LIB) -lscotch -lscotcherrexit
+#ptscotch
+#CCPASTIX := $(CCPASTIX) -I$(SCOTCH_INC) -DDISTRIBUTED -DWITH_SCOTCH
+#EXTRALIB := $(EXTRALIB) -L$(SCOTCH_LIB) -lptscotch -lscotcherrexit
+
+###################################################################
+# Portable Hardware Locality #
+###################################################################
+# If HwLoc library is available, Uncomment the following lines to bind correctly threads on cpus
+#HWLOC_HOME ?= /opt/hwloc/
+#HWLOC_INC ?= $(HWLOC_HOME)/include
+#HWLOC_LIB ?= $(HWLOC_HOME)/lib
+#CCPASTIX := $(CCPASTIX) -I$(HWLOC_INC) -DWITH_HWLOC
+#EXTRALIB := $(EXTRALIB) -L$(HWLOC_LIB) -lhwloc
+
+###################################################################
+# MARCEL #
+###################################################################
+
+# Uncomment following lines for marcel thread support
+#VERSIONSMP := $(VERSIONSMP)_marcel
+#CCPASTIX := $(CCPASTIX) `pm2-config --cflags` -I${PM2_ROOT}/marcel/include/pthread
+#EXTRALIB := $(EXTRALIB) `pm2-config --libs`
+# ---- Thread Posix ------
+EXTRALIB := $(EXTRALIB) -lpthread
+
+# Uncomment following line for bubblesched framework support (need marcel support)
+#VERSIONSCH = _dyn
+#CCPASTIX := $(CCPASTIX) -DPASTIX_BUBBLESCHED
+
+###################################################################
+# BLAS #
+###################################################################
+
+# Choose Blas library (Only 1)
+# Do not forget to set BLAS_HOME if it is not in your environnement
+# BLAS_HOME=/path/to/blas
+#---- Blas ----
+BLASLIB = -lblas
+#---- Gotoblas ----
+#BLASLIB = -L${BLAS_HOME} -lgoto
+#---- MKL ----
+#Uncomment the correct line
+#BLASLIB = -L$(BLAS_HOME) -lmkl_intel_lp64 -lmkl_sequential -lmkl_core
+#BLASLIB = -L$(BLAS_HOME) -lmkl_intel -lmkl_sequential -lmkl_core
+#---- Acml ----
+#BLASLIB = -L$(BLAS_HOME) -lacml
+
+###################################################################
+# PYTHON WRAPPER #
+###################################################################
+#MPI4PY_DIR = /path/to//mpi4py
+#MPI4PY_INC = $(MPI4PY_DIR)/src/include/
+#MPI4PY_LIBDIR = $(MPI4PY_DIR)/build/lib.linux-x86_64-2.7/
+#PYTHON_INC = /usr/include/python2.7/
+#CCTYPES := $(CCTYPES) -fPIC
+
+###################################################################
+# DO NOT TOUCH #
+###################################################################
+
+FOPT := $(CCFOPT)
+FDEB := $(CCFDEB)
+CCHEAD := $(CCPROG) $(CCTYPES) $(CCFOPT)
+CCFOPT := $(CCFOPT) $(CCTYPES) $(CCPASTIX)
+CCFDEB := $(CCFDEB) $(CCTYPES) $(CCPASTIX)
+
+
+###################################################################
+# MURGE COMPATIBILITY #
+###################################################################
+# Uncomment if you need MURGE interface to be thread safe
+# CCPASTIX := $(CCPASTIX) -DMURGE_THREADSAFE
+
+MAKE = $(MKPROG)
+CC = $(MPCCPROG)
+CFLAGS = $(CCFOPT) $(CCTYPESFLT)
+FC = $(MCFPROG)
+FFLAGS = $(CCFOPT)
+LDFLAGS = $(EXTRALIB) $(BLASLIB) -lgfortran -lgfortranbegin
Added: packages/pastix/trunk/debian/config.in
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/config.in?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/config.in (added)
+++ packages/pastix/trunk/debian/config.in Wed May 16 15:45:32 2012
@@ -1,0 +1,226 @@
+HOSTARCH = i686_pc_linux
+VERSIONBIT =
+EXEEXT =
+OBJEXT = .o
+LIBEXT = .a
+CCPROG = gcc -Wall
+CFPROG = gfortran
+CF90PROG = gfortran -ffree-form
+MCFPROG = mpif90
+CF90CCPOPT = -ffree-form -x f95-cpp-input
+# Compilation options for optimization (make expor)
+CCFOPT = -O3
+# Compilation options for debug (make | make debug)
+CCFDEB = -g3
+
+LKFOPT =
+MKPROG = make
+MPCCPROG = mpicc -Wall
+CPP = cpp
+ARFLAGS = ruv
+ARPROG = ar
+EXTRALIB = -lgfortran -lm -lrt
+
+VERSIONMPI = _mpi
+VERSIONSMP = _smp
+VERSIONSCH = _static
+VERSIONINT = _int
+VERSIONPRC = _simple
+VERSIONFLT = _real
+VERSIONORD = _scotch
+
+###################################################################
+# SETTING INSTALL DIRECTORIES #
+###################################################################
+# ROOT = /path/to/install/directory
+# INCLUDEDIR = ${ROOT}/include
+# LIBDIR = ${ROOT}/lib
+# BINDIR = ${ROOT}/bin
+
+###################################################################
+# SHARED LIBRARY GENERATION #
+###################################################################
+SHARED=0
+#SHARED_FLAGS = -shared
+#CCFDEB := ${CCFDEB} -fPIC
+#CCFOPT := ${CCFOPT} -fPIC
+#CFPROG := ${CFPROG} -fPIC
+
+###################################################################
+# INTEGER TYPE #
+###################################################################
+# Uncomment the following lines for integer type support (Only 1)
+
+#VERSIONINT = _long
+#CCTYPES = -DFORCE_LONG -DLONG
+#---------------------------
+#VERSIONINT = _int32
+#CCTYPES = -DFORCE_INT32 -DINTSIZE32
+#---------------------------
+#VERSIONINT = _int64
+#CCTYPES = -DFORCE_INT64 -DINTSSIZE64
+
+###################################################################
+# FLOAT TYPE #
+###################################################################
+CCTYPESFLT =
+# Uncomment the following lines for double precision support
+VERSIONPRC = _double
+CCTYPESFLT := $(CCTYPESFLT) -DFORCE_DOUBLE -DPREC_DOUBLE
+
+# Uncomment the following lines for float=complex support
+#VERSIONFLT = _complex
+#CCTYPESFLT := $(CCTYPESFLT) -DFORCE_COMPLEX -DTYPE_COMPLEX
+
+
+###################################################################
+# MPI/THREADS #
+###################################################################
+
+# Uncomment the following lines for sequential (NOMPI) version
+#VERSIONMPI = _nompi
+#CCTYPES := $(CCTYPES) -DFORCE_NOMPI
+#MPCCPROG = $(CCPROG)
+#MCFPROG = $(CFPROG)
+
+# Uncomment the following lines for non-threaded (NOSMP) version
+#VERSIONSMP = _nosmp
+#CCTYPES := $(CCTYPES) -DFORCE_NOSMP
+
+# Uncomment the following line to enable a progression thread
+#CCPASTIX := $(CCPASTIX) -DTHREAD_COMM
+
+# Uncomment the following line if your MPI doesn't support MPI_THREAD_MULTIPLE level
+#CCPASTIX := $(CCPASTIX) -DPASTIX_FUNNELED
+
+# Uncomment the following line if your MPI doesn't support MPI_Datatype correctly
+#CCPASTIX := $(CCPASTIX) -DNO_MPI_TYPE
+
+# Uncomment the following line if you want to use semaphore barrier
+# instead of MPI barrier (with IPARM_AUTOSPLIT_COMM)
+#CCPASTIX := $(CCPASTIX) -DWITH_SEM_BARRIER
+
+# Uncomment the following lines to enable StarPU.
+#CCPASTIX := ${CCPASTIX} `pkg-config libstarpu --cflags` -DWITH_STARPU
+#EXTRALIB := $(EXTRALIB) `pkg-config libstarpu --libs`
+
+# Uncomment the following line to enable StarPU profiling
+# ( IPARM_VERBOSE > API_VERBOSE_NO ).
+#CCPASTIX := ${CCPASTIX} -DSTARPU_PROFILING
+
+# Uncomment the following line to disable CUDA (StarPU)
+#CCPASTIX := ${CCPASTIX} -DFORCE_NO_CUDA
+
+###################################################################
+# Options #
+###################################################################
+
+# Show memory usage statistics
+#CCPASTIX := $(CCPASTIX) -DMEMORY_USAGE
+
+# Show memory usage statistics in solver
+#CCPASTIX := $(CCPASTIX) -DSTATS_SOPALIN
+
+# Uncomment following line for dynamic thread scheduling support
+#CCPASTIX := $(CCPASTIX) -DPASTIX_DYNSCHED
+
+# Uncomment the following lines for Out-of-core
+#CCPASTIX := $(CCPASTIX) -DOOC -DOOC_NOCOEFINIT -DOOC_DETECT_DEADLOCKS
+
+###################################################################
+# GRAPH PARTITIONING #
+###################################################################
+
+# Uncomment the following lines for using metis ordering
+#VERSIONORD = _metis
+#METIS_HOME = ${HOME}/metis-4.0
+#CCPASTIX := $(CCPASTIX) -DMETIS -I$(METIS_HOME)/Lib
+#EXTRALIB := $(EXTRALIB) -L$(METIS_HOME) -lmetis
+
+# Scotch always needed to compile
+SCOTCH_HOME ?=
+SCOTCH_INC = /usr/include/scotch
+SCOTCH_LIB = /usr/lib
+# Uncomment on of this blocks
+#scotch
+CCPASTIX := $(CCPASTIX) -I$(SCOTCH_INC) -DWITH_SCOTCH
+EXTRALIB := $(EXTRALIB) -L$(SCOTCH_LIB) -lscotch -lscotcherrexit
+#ptscotch
+#CCPASTIX := $(CCPASTIX) -I$(SCOTCH_INC) -DDISTRIBUTED -DWITH_SCOTCH
+#EXTRALIB := $(EXTRALIB) -L$(SCOTCH_LIB) -lptscotch -lscotcherrexit
+
+###################################################################
+# Portable Hardware Locality #
+###################################################################
+# If HwLoc library is available, Uncomment the following lines to bind correctly threads on cpus
+#HWLOC_HOME ?= /opt/hwloc/
+#HWLOC_INC ?= $(HWLOC_HOME)/include
+#HWLOC_LIB ?= $(HWLOC_HOME)/lib
+#CCPASTIX := $(CCPASTIX) -I$(HWLOC_INC) -DWITH_HWLOC
+#EXTRALIB := $(EXTRALIB) -L$(HWLOC_LIB) -lhwloc
+
+###################################################################
+# MARCEL #
+###################################################################
+
+# Uncomment following lines for marcel thread support
+#VERSIONSMP := $(VERSIONSMP)_marcel
+#CCPASTIX := $(CCPASTIX) `pm2-config --cflags` -I${PM2_ROOT}/marcel/include/pthread
+#EXTRALIB := $(EXTRALIB) `pm2-config --libs`
+# ---- Thread Posix ------
+EXTRALIB := $(EXTRALIB) -lpthread
+
+# Uncomment following line for bubblesched framework support (need marcel support)
+#VERSIONSCH = _dyn
+#CCPASTIX := $(CCPASTIX) -DPASTIX_BUBBLESCHED
+
+###################################################################
+# BLAS #
+###################################################################
+
+# Choose Blas library (Only 1)
+# Do not forget to set BLAS_HOME if it is not in your environnement
+# BLAS_HOME=/path/to/blas
+#---- Blas ----
+BLASLIB = -lblas
+#---- Gotoblas ----
+#BLASLIB = -L${BLAS_HOME} -lgoto
+#---- MKL ----
+#Uncomment the correct line
+#BLASLIB = -L$(BLAS_HOME) -lmkl_intel_lp64 -lmkl_sequential -lmkl_core
+#BLASLIB = -L$(BLAS_HOME) -lmkl_intel -lmkl_sequential -lmkl_core
+#---- Acml ----
+#BLASLIB = -L$(BLAS_HOME) -lacml
+
+###################################################################
+# PYTHON WRAPPER #
+###################################################################
+#MPI4PY_DIR = /path/to//mpi4py
+#MPI4PY_INC = $(MPI4PY_DIR)/src/include/
+#MPI4PY_LIBDIR = $(MPI4PY_DIR)/build/lib.linux-x86_64-2.7/
+#PYTHON_INC = /usr/include/python2.7/
+#CCTYPES := $(CCTYPES) -fPIC
+
+###################################################################
+# DO NOT TOUCH #
+###################################################################
+
+FOPT := $(CCFOPT)
+FDEB := $(CCFDEB)
+CCHEAD := $(CCPROG) $(CCTYPES) $(CCFOPT)
+CCFOPT := $(CCFOPT) $(CCTYPES) $(CCPASTIX)
+CCFDEB := $(CCFDEB) $(CCTYPES) $(CCPASTIX)
+
+
+###################################################################
+# MURGE COMPATIBILITY #
+###################################################################
+# Uncomment if you need MURGE interface to be thread safe
+# CCPASTIX := $(CCPASTIX) -DMURGE_THREADSAFE
+
+MAKE = $(MKPROG)
+CC = $(MPCCPROG)
+CFLAGS = $(CCFOPT) $(CCTYPESFLT)
+FC = $(MCFPROG)
+FFLAGS = $(CCFOPT)
+LDFLAGS = $(EXTRALIB) $(BLASLIB)
Modified: packages/pastix/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/control?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/control (original)
+++ packages/pastix/trunk/debian/control Wed May 16 15:45:32 2012
@@ -1,12 +1,14 @@
Source: pastix
-Section: math
-Priority: optional
+Section: libs
+Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Pierre Saramito <pierre.saramito at imag.fr>
-Homepage: http://pastix.gforge.inria.fr
-Build-Depends: quilt, debhelper (>=7), libscotch-dev, libptscotch-dev,
- mpi-default-dev | openmpi-dev, mpi-default-bin | openmpi-bin
-Standards-Version: 3.9.1
+Uploaders: Pierre Saramito <pierre.saramito at imag.fr>,
+ Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: debhelper (>= 7.0.50~), quilt, mpi-default-dev,
+ libscotch-dev, libptscotch-dev | libparmetis-dev, libblas-dev | libblas-3gf.so,
+ texlive-latex-base
+Standards-Version: 3.9.3
+Homepage: http://pastix.gforge.inria.fr/files/README-txt.html
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/pastix/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/pastix/trunk/
@@ -16,7 +18,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends},
libscotch-dev, libptscotch-dev,
mpi-default-dev | openmpi-dev, mpi-default-bin | openmpi-bin
-Suggests: pastix-doc(= ${binary:Version})
+Suggests: libpastix-doc(= ${binary:Version})
Description: Parallel sparse matrix package (libraries)
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
@@ -25,15 +27,15 @@
Package: libpastix-dev
Section: libdevel
Architecture: any
-Depends: libpastix1(= ${binary:Version}), pastix(= ${binary:Version}), ${misc:Depends}
-Recommends: pastix-doc(= ${binary:Version})
+Depends: libpastix1(= ${binary:Version}), pastix-bin(= ${binary:Version}), ${misc:Depends}
+Recommends: libpastix-doc(= ${binary:Version})
Suggests:
Description: Parallel sparse matrix package (headers)
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
linear systems based on direct and block ILU(k) iterative methods.
-Package: pastix-doc
+Package: libpastix-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, dpkg (>= 1.15.4)
@@ -42,11 +44,11 @@
provides a high performance parallel solver for very large sparse
linear systems based on direct and block ILU(k) iterative methods.
-Package: pastix
+Package: pastix-bin
Section: math
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libpastix-dev(= ${binary:Version}), pastix-doc(= ${binary:Version})
+Recommends: libpastix-dev(= ${binary:Version}), libpastix-doc(= ${binary:Version})
Description: Parallel sparse matrix package
PaStiX (Parallel Sparse matriX package) is a scientific library that
provides a high performance parallel solver for very large sparse
Modified: packages/pastix/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/copyright?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/copyright (original)
+++ packages/pastix/trunk/debian/copyright Wed May 16 15:45:32 2012
@@ -1,20 +1,50 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
-Name: pastix
-Maintainer: Pierre Saramito <pierre.saramito at imag.fr>
+This work was packaged for Debian by:
-Source: http://pastix.gforge.inria.fr/
+ Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> on Wed, 13 Oct 2010 11:26:21 +0200
-Upstream Author:
- Faverge Mathieu <faverge at labri.fr>
- Henon Pascal <henon at labri.fr>
- Lacoste Xavier <lacoste at labri.fr>
- Ramet Pierre <ramet at labri.fr>
+It was downloaded from:
-Copyright: Copyright 2008 BORDEAUX I UNIVERSITY & INRIA
+ http://pastix.gforge.inria.fr/files/README-txt.html
-License: CeCILL-C-V2
- This software is governed by the CeCILL-C license under French law
- and abiding by the rules of distribution of free software. You can
- use, modify and/or redistribute the software under the terms of the
- CeCILL-C license as circulated by CEA, CNRS and INRIA at the following
- URL: "http://www.cecill.info".
+Upstream Authors:
+
+ Faverge Mathieu <faverge at labri.fr>
+ Henon Pascal <henon at labri.fr>
+ Lacoste Xavier <lacoste at labri.fr>
+ Ramet Pierre <ramet at labri.fr>
+
+Copyright:
+
+ Copyright 2008 BORDEAUX I UNIVERSITY & INRIA
+
+ This software is governed by the CeCILL-C license under French law
+ and abiding by the rules of distribution of free software. You can
+ use, modify and/or redistribute the software under the terms of the
+ CeCILL-C license as circulated by CEA, CNRS and INRIA at the following
+ URL: "http://www.cecill.info".
+
+ As a counterpart to the access to the source code and rights to copy,
+ modify and redistribute granted by the license, users are provided
+ only with a limited warranty and the software's author, the holder of
+ the economic rights, and the successive licensors have only limited
+ liability.
+
+ In this respect, the user's attention is drawn to the risks associated
+ with loading, using, modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean that it is complicated to manipulate, and that also
+ therefore means that it is reserved for developers and experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards
+ their requirements in conditions enabling the security of their
+ systems and/or data to be ensured and, more generally, to use and
+ operate it in the same conditions as regards security.
+
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-C license and that you accept its terms.
+ License:
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+
Modified: packages/pastix/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/docs?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/docs (original)
+++ packages/pastix/trunk/debian/docs Wed May 16 15:45:32 2012
@@ -1,1 +1,0 @@
-src/README.txt
Modified: packages/pastix/trunk/debian/libpastix-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix-dev.install?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/libpastix-dev.install (original)
+++ packages/pastix/trunk/debian/libpastix-dev.install Wed May 16 15:45:32 2012
@@ -1,1 +1,4 @@
-usr/include/pastix/*.{h,inc}
+install/*.h usr/include/pastix/
+install/*.inc usr/include/pastix/
+install/*.so usr/lib/
+install/*.a usr/lib/
Added: packages/pastix/trunk/debian/libpastix-doc.doc-base.refcard
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix-doc.doc-base.refcard?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/libpastix-doc.doc-base.refcard (added)
+++ packages/pastix/trunk/debian/libpastix-doc.doc-base.refcard Wed May 16 15:45:32 2012
@@ -1,0 +1,8 @@
+Document: pastix-refcard
+Title: pastix library - reference card
+Author: Faverge Mathieu, Henon Pascal, Lacoste Xavier, Ramet Pierre
+Abstract: PaStiX (Parallel Sparse matriX package) is a scientific library that provides a high performance parallel solver for very large sparse linear systems based on direct and block ILU(k) iterative methods.
+Section: Science/Mathematics
+
+Format: PDF
+Files: /usr/share/doc/libpastix/refcard.pdf.gz
Added: packages/pastix/trunk/debian/libpastix-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix-doc.install?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/libpastix-doc.install (added)
+++ packages/pastix/trunk/debian/libpastix-doc.install Wed May 16 15:45:32 2012
@@ -1,0 +1,1 @@
+doc/refcard/*.pdf usr/share/doc/libpastix/
Modified: packages/pastix/trunk/debian/libpastix1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/libpastix1.install?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/libpastix1.install (original)
+++ packages/pastix/trunk/debian/libpastix1.install Wed May 16 15:45:32 2012
@@ -1,1 +1,1 @@
-usr/lib/*
+install/*.so.1* usr/lib/
Added: packages/pastix/trunk/debian/pastix-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/pastix-bin.install?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/pastix-bin.install (added)
+++ packages/pastix/trunk/debian/pastix-bin.install Wed May 16 15:45:32 2012
@@ -1,0 +1,2 @@
+install/pastix-conf usr/bin/
+debian/pastix-conf.1 usr/share/man/man1/
Added: packages/pastix/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/patches/Makefile.patch?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/patches/Makefile.patch (added)
+++ packages/pastix/trunk/debian/patches/Makefile.patch Wed May 16 15:45:32 2012
@@ -1,0 +1,16 @@
+Index: pastix-5.2/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ pastix-5.2/Makefile 2012-05-16 15:09:17.000000000 +0200
+@@ -0,0 +1,11 @@
++all:
++ cd src && make all
++
++install:
++ cd src && make install DESTDIR=${DESTDIR}
++
++clean:
++ cd src && make clean
++
++check:
++ cd src && make tests
Modified: packages/pastix/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/patches/series?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/patches/series (original)
+++ packages/pastix/trunk/debian/patches/series Wed May 16 15:45:32 2012
@@ -1,1 +1,2 @@
-scotch-include-guard.patch
+sharedlibrary.patch
+Makefile.patch
Added: packages/pastix/trunk/debian/patches/sharedlibrary.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/patches/sharedlibrary.patch?rev=44813&op=file
==============================================================================
--- packages/pastix/trunk/debian/patches/sharedlibrary.patch (added)
+++ packages/pastix/trunk/debian/patches/sharedlibrary.patch Wed May 16 15:45:32 2012
@@ -1,0 +1,344 @@
+Index: pastix-5.2/src/example/src/makefile
+===================================================================
+--- pastix-5.2.orig/src/example/src/makefile 2012-03-29 15:35:35.000000000 +0200
++++ pastix-5.2/src/example/src/makefile 2012-05-16 16:28:11.000000000 +0200
+@@ -1,5 +1,5 @@
+ PASTIX_BIN ?= ../../../install
+-PASTIX_LIB ?= ../../../install
++PASTIX_LIB ?= ../../../install/lib
+ PASTIX_INC ?= ../../../install
+ PASTIX_CONF = ${PASTIX_BIN}/pastix-conf
+ CFLAGS = $(shell ${PASTIX_CONF} --ccopts) $(shell ${PASTIX_CONF} --opts)
+@@ -19,7 +19,7 @@
+ EXTRALIB := -lmatrix_driver $(shell ${PASTIX_CONF} --libs)
+ EXTRALIB_MURGE = $(shell ${PASTIX_CONF} --libs_murge)
+
+-DST = ../bin
++DST = ../bin
+ OBJ = ../obj
+ ###################################################################
+ # BLAS #
+@@ -69,7 +69,8 @@
+ ${DST}/schur \
+ ${DST}/schur2 \
+ ${DST}/refinement \
+- ${DST}/isolate_zeros
++ ${DST}/isolate_zeros \
++ runtest
+ ifeq (1, $(words $(findstring -DMULT_SMX, ${OPTS})))
+ all : ${DST}/mult-rhs
+ endif
+@@ -117,6 +118,7 @@
+ examples_z : promptblas \
+ ${EXAMPLES_Z}
+
++ifeq (0, ${SHARED})
+ DEPEND = $(filter-out $(wildcard ${DST}), ${DST}) \
+ ${PASTIX_LIB}/libpastix.a \
+ ${PASTIX_LIB}/libmatrix_driver.a \
+@@ -125,32 +127,67 @@
+ ${PASTIX_INC}/read_matrix.h \
+ ${PASTIX_INC}/cscd_utils.h \
+ utils.h sutils.h cutils.h dutils.h zutils.h
++else
++DEPEND = $(filter-out $(wildcard ${DST}), ${DST}) \
++ ${PASTIX_LIB}/libpastix.so \
++ ${PASTIX_LIB}/libmatrix_driver.so \
++ ${PASTIX_INC}/pastix.h \
++ ${PASTIX_INC}/get_options.h \
++ ${PASTIX_INC}/read_matrix.h \
++ ${PASTIX_INC}/cscd_utils.h \
++ utils.h sutils.h cutils.h dutils.h zutils.h
++endif
++
+ ${DST}/% : %.c ${DEPEND}
+ ${CL} $< -o $@ ${INC} ${EXTRALIB}
+
++ifeq (0, ${SHARED})
+ DEPEND_MURGE = $(filter-out $(wildcard ${DST}), ${DST}) \
+ ${PASTIX_LIB}/libpastix.a \
+ ${PASTIX_LIB}/libpastix_murge.a \
+ ${PASTIX_INC}/pastix.h \
+ ${PASTIX_INC}/murge.h
++else
++DEPEND_MURGE = $(filter-out $(wildcard ${DST}), ${DST}) \
++ ${PASTIX_LIB}/libpastix.so \
++ ${PASTIX_LIB}/libpastix_murge.so \
++ ${PASTIX_INC}/pastix.h \
++ ${PASTIX_INC}/murge.h
++endif
+ ${DST}/murge : murge.c ${DEPEND_MURGE}
+ ${CL} ${OMP_FLAG} $< -o $@ ${INC} ${EXTRALIB_MURGE}
+
+ ${DST}/murge-product : murge-product.c ${DEPEND_MURGE}
+ ${CL} ${OMP_FLAG} $< -o $@ ${INC} ${EXTRALIB_MURGE}
+
++ifeq (0, ${SHARED})
+ FORTRAN_DEPEND = $(filter-out $(wildcard ${DST}), ${DST}) \
+ ${OBJ}/utils.o \
+ ${PASTIX_INC}/pastix_fortran.h \
+ ${PASTIX_LIB}/libmatrix_driver.a \
+ ${PASTIX_LIB}/libpastix.a
++else
++FORTRAN_DEPEND = $(filter-out $(wildcard ${DST}), ${DST}) \
++ ${OBJ}/utils.o \
++ ${PASTIX_INC}/pastix_fortran.h \
++ ${PASTIX_LIB}/libmatrix_driver.so \
++ ${PASTIX_LIB}/libpastix.so
++endif
++
+ ${DST}/% : %.F90 ${FORTRAN_DEPEND}
+ ${FL} ${INC} $< ${OBJ}/utils.o -o $@ ${EXTRALIB}
+
++ifeq (0, ${SHARED})
+ MURGE_FORTRAN_DEPEND = $(filter-out $(wildcard ${DST}), ${DST})\
+ ${PASTIX_INC}/murge.inc \
+ ${PASTIX_LIB}/libpastix.a \
+ ${PASTIX_LIB}/libpastix_murge.a
++else
++MURGE_FORTRAN_DEPEND = $(filter-out $(wildcard ${DST}), ${DST})\
++ ${PASTIX_INC}/murge.inc \
++ ${PASTIX_LIB}/libpastix.so \
++ ${PASTIX_LIB}/libpastix_murge.so
++endif
+
+ ${DST}/fmurge : ${OBJ}/fmurge.F90 ${MURGE_FORTRAN_DEPEND}
+ ${FL} ${OMP_FLAG} ${INC} ${OBJ}/fmurge.F90 -o $@ ${EXTRALIB_MURGE}
+@@ -253,3 +290,24 @@
+ @echo "* Your are using ${BLAS}, you can edit this in examples/src/makefile *"
+ @echo "************************************************************************************"
+ @sleep 2
++ mkdir -p ${DST}
++ mkdir -p ${OBJ}
++
++ifeq (0, ${SHARED})
++runtest:
++ @echo "************************************************************************************"
++ @echo "* running ./example/bin/simple -lap 100 *"
++ @echo "************************************************************************************"
++ echo $(shell pwd)
++ ${DST}/simple -lap 100
++ @sleep 2
++else
++runtest:
++ @echo "************************************************************************************"
++ @echo "* running ./example/bin/simple -lap 100 *"
++ @echo "************************************************************************************"
++ echo $(shell pwd)
++ LD_LIBRARY_PATH=${PASTIX_LIB} ${DST}/simple -lap 100
++ @sleep 2
++endif
++
+Index: pastix-5.2/src/murge/examples/Makefile
+===================================================================
+--- pastix-5.2.orig/src/murge/examples/Makefile 2011-01-20 10:02:08.000000000 +0100
++++ pastix-5.2/src/murge/examples/Makefile 2012-05-16 16:28:07.000000000 +0200
+@@ -1,10 +1,13 @@
+ include ../Makefile.inc
+ CFLAGS := $(CFLAGS) -I../include
+
+-all : examples
++all : prerequisite examples
+ include ../Makefile.rules
+
+-examples : ../Makefile.inc \
++prerequisite:
++ mkdir -p $(BINDIR)
++
++examples : \
+ $(BINDIR)/murge-dist$(EXE) \
+ $(BINDIR)/murge-global$(EXE) \
+ $(BINDIR)/murge-mm$(EXE) \
+@@ -12,5 +15,7 @@
+ $(BINDIR)/multi-matrix-and-rhs$(EXE)
+
+ $(BINDIR)/murge-mm$(EXE) : $(OBJDIR)/murge-mm$(OBJ) $(OBJDIR)/mmio$(OBJ) $(BINDIR)
+- $(CC) $(CFLAGS) $(OBJDIR)/murge-mm$(OBJ) $(OBJDIR)/mmio$(OBJ) -o $@ $(LDSOLVER) $(LDFLAGS)
++ $(CC) $(CFLAGS) -I../include $(OBJDIR)/murge-mm$(OBJ) $(OBJDIR)/mmio$(OBJ) -o $@ $(LDSOLVER) $(LDFLAGS)
+
++$(BINDIR)/murge-dist$(EXE) :$(OBJDIR)/murge-dist$(OBJ)
++ $(CC) $(CFLAGS) -I../include $(OBJDIR)/murge-dist$(OBJ) -o $@ $(LDSOLVER) $(LDFLAGS)
+Index: pastix-5.2/src/Makefile
+===================================================================
+--- pastix-5.2.orig/src/Makefile 2012-05-16 10:38:20.000000000 +0200
++++ pastix-5.2/src/Makefile 2012-05-16 16:28:07.000000000 +0200
+@@ -117,6 +117,7 @@
+ $(BUILD_LIBDIR) ${BUILD_BINDIR} ${BUILD_INCDIR}
+
+ # General tule
++ifeq (0, ${SHARED})
+ all: $(patsubst %,%/.,$(TREE)) \
+ $(patsubst %,%/.,$(DEPTREE)) \
+ $(BUILD_LIBDIR)/libpastix$(LIB) \
+@@ -127,6 +128,20 @@
+ $(BUILD_INCDIR)/pastix_fortran.h \
+ $(BUILD_INCDIR)/pastix_nompi.h \
+ $(BUILD_BINDIR)/pastix-conf
++else
++all: $(patsubst %,%/.,$(TREE)) \
++ $(patsubst %,%/.,$(DEPTREE)) \
++ $(BUILD_LIBDIR)/libpastix${LIB_SO} \
++ $(BUILD_LIBDIR)/libpastix_murge${LIB_SO} \
++ $(BUILD_INCDIR)/murge.h \
++ $(BUILD_INCDIR)/pastix.h \
++ $(BUILD_INCDIR)/murge.inc \
++ $(BUILD_INCDIR)/pastix_fortran.h \
++ $(BUILD_INCDIR)/pastix_nompi.h \
++ $(BUILD_BINDIR)/pastix-conf
++endif
++
++tests: examples murge
+
+ #Provide some help
+ help info man:
+@@ -195,10 +210,14 @@
+ @cp config.in murge/Makefile.inc
+ @echo "">> murge/Makefile.inc
+ @echo "LDSOLVER = -L$(shell pwd)/../install -lpastix_murge -lpastix" >> murge/Makefile.inc
+- $(MKPROG) -C murge/example
++ $(MKPROG) -C murge example
+
+
+-drivers: $(BUILD_LIBDIR)/libmatrix_driver$(LIB) $(BUILD_LIBDIR)/libmatrix_driver$(LIB_SO) $(BUILD_INCDIR)/get_options.h $(BUILD_INCDIR)/read_matrix.h
++ifeq (0, ${SHARED})
++drivers: $(BUILD_LIBDIR)/libmatrix_driver$(LIB) $(BUILD_INCDIR)/get_options.h $(BUILD_INCDIR)/read_matrix.h
++else
++drivers: $(BUILD_LIBDIR)/libmatrix_driver${LIB_SO} $(BUILD_INCDIR)/get_options.h $(BUILD_INCDIR)/read_matrix.h
++endif
+
+ INSTALLDIRS=${INCLUDEDIR} ${BINDIR} ${LIBDIR}
+ ${INSTALLDIRS} :
+@@ -207,24 +226,27 @@
+ install: all drivers
+ install: $(foreach dir, ${INSTALLDIRS}, $(filter-out $(wildcard $(dir)), $(dir)))
+ install: ${BINDIR}/pastix-conf
++ifeq (0, ${SHARED})
+ install: ${LIBDIR}/libpastix${LIB}
+-ifeq (1, ${SHARED})
++else
+ install: ${LIBDIR}/libpastix${LIB_SO}
+ endif
+ install: $(INCLUDEDIR)/pastix.h
++
+ ${LIBDIR}/libpastix${LIB}: $(BUILD_LIBDIR)/libpastix${LIB}
+- cp $(BUILD_LIBDIR)/libpastix${LIB} ${LIBDIR}/libpastix${LIB}
+- -cp $(BUILD_LIBDIR)/libmatrix_driver${LIB} ${LIBDIR}/libmatrix_driver${LIB}
+- -cp $(BUILD_LIBDIR)/libpastix_murge$(LIB) ${LIBDIR}/libpastix_murge${LIB}
++ cp $(BUILD_LIBDIR)/libpastix${LIB} $(DESTDIR)${LIBDIR}/libpastix${LIB}
++ -cp $(BUILD_LIBDIR)/libmatrix_driver${LIB} $(DESTDIR)${LIBDIR}/libmatrix_driver${LIB}
++ -cp $(BUILD_LIBDIR)/libpastix_murge$(LIB) $(DESTDIR)${LIBDIR}/libpastix_murge${LIB}
++
+ ${INCLUDEDIR}/pastix.h:
+- -cp $(BUILD_INCDIR)/murge.h ${INCLUDEDIR}/murge.h
+- cp $(BUILD_INCDIR)/pastix.h ${INCLUDEDIR}/pastix.h
+- -cp $(BUILD_INCDIR)/murge.inc ${INCLUDEDIR}/murge.inc
+- -cp $(BUILD_INCDIR)/pastix_fortran.h ${INCLUDEDIR}/pastix_fortran.h
+- -cp $(BUILD_INCDIR)/pastix_nompi.h ${INCLUDEDIR}/pastix_nompi.h
+- -cp $(BUILD_INCDIR)/cscd_utils.h ${INCLUDEDIR}/cscd_utils.h
+- -cp $(BUILD_INCDIR)/read_matrix.h ${INCLUDEDIR}/read_matrix.h
+- -cp $(BUILD_INCDIR)/get_options.h ${INCLUDEDIR}/get_options.h
++ -cp $(BUILD_INCDIR)/murge.h $(DESTDIR)${INCLUDEDIR}/murge.h
++ cp $(BUILD_INCDIR)/pastix.h $(DESTDIR)${INCLUDEDIR}/pastix.h
++ -cp $(BUILD_INCDIR)/murge.inc $(DESTDIR)${INCLUDEDIR}/murge.inc
++ -cp $(BUILD_INCDIR)/pastix_fortran.h $(DESTDIR)${INCLUDEDIR}/pastix_fortran.h
++ -cp $(BUILD_INCDIR)/pastix_nompi.h $(DESTDIR)${INCLUDEDIR}/pastix_nompi.h
++ -cp $(BUILD_INCDIR)/cscd_utils.h $(DESTDIR)${INCLUDEDIR}/cscd_utils.h
++ -cp $(BUILD_INCDIR)/read_matrix.h $(DESTDIR)${INCLUDEDIR}/read_matrix.h
++ -cp $(BUILD_INCDIR)/get_options.h $(DESTDIR)${INCLUDEDIR}/get_options.h
+
+
+ $(BUILD_INCDIR)/get_options.h: matrix_drivers/src/get_options.h
+@@ -245,24 +267,29 @@
+ $(AR) $(ARFLAGS) $(BUILD_LIBDIR)/libpastix${VERSIONNAME}${LIB} $(^)
+ -$(RANLIB) $(BUILD_LIBDIR)/libpastix${VERSIONNAME}${LIB}
+ (cd $(BUILD_LIBDIR) && ln -sf libpastix${VERSIONNAME}${LIB} libpastix$(LIB))
+-ifeq (1, ${SHARED})
+-$(BUILD_LIBDIR)/libmatrix_driver$(LIB_SO): $(OBJ_DRIVERS)
+- $(MPCCPROG) $(SHARED_FLAGS) -o $(BUILD_LIBDIR)/libmatrix_driver${VERSIONNAME}${LIB_SO} $(^)
+- (cd $(BUILD_LIBDIR) && ln -sf libmatrix_driver${VERSIONNAME}${LIB_SO} libmatrix_driver$(LIB_SO))
+-
+-$(BUILD_LIBDIR)/libpastix$(LIB_SO): $(OBJ_LIB)
+- $(MPCCPROG) $(SHARED_FLAGS) -o $(BUILD_LIBDIR)/libpastix${VERSIONNAME}${LIB_SO} $(^)
+- (cd $(BUILD_LIBDIR) && ln -sf libpastix${VERSIONNAME}${LIB_SO} libpastix$(LIB_SO))
+-
+-$(BUILD_LIBDIR)/libpastix_murge$(LIB_SO): $(OBJ_MURGE)
+- $(MPCCPROG) $(SHARED_FLAGS) -o $(BUILD_LIBDIR)/libpastix_murge${VERSIONNAME}${LIB_SO} $(^)
+- (cd $(BUILD_LIBDIR) && ln -sf libpastix_murge${VERSIONNAME}${LIB_SO} libpastix_murge$(LIB_SO))
++
++$(BUILD_LIBDIR)/libmatrix_driver${LIB_SO}: $(OBJ_DRIVERS)
++ $(MPCCPROG) $(SHARED_FLAGS) $(LDFLAGS) -Wl,-soname,libmatrix_driver${VERSIONNAME}${LIB_SO}${SOVERSION} -o $(BUILD_LIBDIR)/libmatrix_driver${VERSIONNAME}${LIB_SO}${SOVERSION} $(^)
++ (cd $(BUILD_LIBDIR) && ln -sf libmatrix_driver${VERSIONNAME}${LIB_SO}${SOVERSION} libmatrix_driver${VERSIONNAME}${LIB_SO}${SOVER})
++ (cd $(BUILD_LIBDIR) && ln -sf libmatrix_driver${VERSIONNAME}${LIB_SO}${SOVER} libmatrix_driver${VERSIONNAME}${LIB_SO})
++ (cd $(BUILD_LIBDIR) && ln -sf libmatrix_driver${VERSIONNAME}${LIB_SO} libmatrix_driver${LIB_SO})
++
++$(BUILD_LIBDIR)/libpastix${LIB_SO}: $(OBJ_LIB)
++ $(MPCCPROG) $(SHARED_FLAGS) $(LDFLAGS) -Wl,-soname,libpastix${VERSIONNAME}${LIB_SO}${SOVERSION} -o $(BUILD_LIBDIR)/libpastix${VERSIONNAME}${LIB_SO}${SOVERSION} $(^)
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix${VERSIONNAME}${LIB_SO}${SOVERSION} libpastix${VERSIONNAME}${LIB_SO}${SOVER})
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix${VERSIONNAME}${LIB_SO}${SOVER} libpastix${VERSIONNAME}${LIB_SO})
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix${VERSIONNAME}${LIB_SO} libpastix${LIB_SO})
++
++$(BUILD_LIBDIR)/libpastix_murge${LIB_SO}: $(OBJ_MURGE)
++ $(MPCCPROG) $(SHARED_FLAGS) $(LDFLAGS) -Wl,-soname,libpastix_murge${VERSIONNAME}${LIB_SO}${SOVERSION} -o $(BUILD_LIBDIR)/libpastix_murge${VERSIONNAME}${LIB_SO}${SOVERSION} $(^)
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix_murge${VERSIONNAME}${LIB_SO}${SOVERSION} libpastix_murge${VERSIONNAME}${LIB_SO}${SOVER})
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix_murge${VERSIONNAME}${LIB_SO}${SOVER} libpastix_murge${VERSIONNAME}${LIB_SO})
++ (cd $(BUILD_LIBDIR) && ln -sf libpastix_murge${VERSIONNAME}${LIB_SO} libpastix_murge${LIB_SO})
+
+ ${LIBDIR}/libpastix${LIB_SO}: $(BUILD_LIBDIR)/libpastix${LIB_SO}
+- cp $(BUILD_LIBDIR)/libpastix${LIB_SO} ${LIBDIR}/libpastix${LIB_SO}
+- -cp $(BUILD_LIBDIR)/libmatrix_driver${LIB_SO} ${LIBDIR}/libmatrix_driver${LIB_SO}
+- -cp $(BUILD_LIBDIR)/libpastix_murge$(LIB_SO) ${LIBDIR}/libpastix_murge${LIB_SO}
+-endif
++ cp $(BUILD_LIBDIR)/libpastix*${LIB_SO}* $(DESTDIR)${LIBDIR}
++ -cp $(BUILD_LIBDIR)/libmatrix_driver*${LIB_SO}* $(DESTDIR)${LIBDIR}
++ -cp $(BUILD_LIBDIR)/libpastix_murge*${LIB_SO}* $(DESTDIR)${LIBDIR}
+
+
+ $(BUILD_LIBDIR)/libmatrix_driver$(LIB): $(OBJ_DRIVERS)
+Index: pastix-5.2/src/murge/Makefile
+===================================================================
+--- pastix-5.2.orig/src/murge/Makefile 2011-07-28 17:32:03.000000000 +0200
++++ pastix-5.2/src/murge/Makefile 2012-05-16 16:28:07.000000000 +0200
+@@ -22,13 +22,13 @@
+ CFLAGS := $(CFLAGS) -I./include/
+
+ example : Makefile.inc
+- (cd examples && $(MAKE))
++ $(MAKE) -C examples
+
+ fortran :
+ ./scripts/genfort.pl include/murge.h > include/murge.inc
+
+ bin :
+- mkdir bin
++ mkdir -p bin
+
+ clean :
+ (cd examples && make clean)
+Index: pastix-5.2/src/murge/Makefile.rules
+===================================================================
+--- pastix-5.2.orig/src/murge/Makefile.rules 2009-02-12 10:48:12.000000000 +0100
++++ pastix-5.2/src/murge/Makefile.rules 2012-05-16 16:28:07.000000000 +0200
+@@ -5,17 +5,17 @@
+ BINDIR = bin
+
+ $(OBJDIR)/%$(OBJ) : $(SRCDIR)/%.c $(OBJDIR)
+- $(CC) $(CFLAGS) -c $< -o $@
++ $(CC) $(CFLAGS) -I../include -c $< -o $@
+
+ $(BINDIR)/%$(EXE) : $(OBJDIR)/%$(OBJ) $(BINDIR)
+- $(CC) $(CFLAGS) $< -o $@ $(LDSOLVER) $(LDFLAGS)
++ $(CC) $(CFLAGS) -I../include $< -o $@ $(LDSOLVER) $(LDFLAGS)
+
+ bin :
+- mkdir bin
++ mkdir -p bin
+
+ obj :
+- mkdir obj
++ mkdir -p obj
+
+ clean :
+ rm -rf bin
+- rm -rf obj
+\ No newline at end of file
++ rm -rf obj
Modified: packages/pastix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/pastix/trunk/debian/rules?rev=44813&op=diff
==============================================================================
--- packages/pastix/trunk/debian/rules (original)
+++ packages/pastix/trunk/debian/rules Wed May 16 15:45:32 2012
@@ -1,138 +1,58 @@
#!/usr/bin/make -f
-#
-# TODO:
-# - tester avec rheolef
-# - fusion en 1 paquet "libpastix1"
-# Note: pour {seq,mpi}-smp : ca plante en openmpi
-# - pastix-conf : revoir le script, suivant {seq,mpi} ? wrap + option -{seq,mpi} ?
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),)
+ export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN)
+endif
+$(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS))
-# Variables declaration
-ABI_VERSION=1
-VERSION=3184
-
-LIBPASTIX=libpastix${ABI_VERSION}
-LIBPASTIX_DEV=libpastix-dev
-PASTIX_DOC=pastix-doc
-PASTIX_RUNTIME=pastix
-
-TMPDIR=debian/tmp-pastix
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ test_makeflags = -j$(NUMJOBS)
endif
-patch-stamp:
- - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- touch $@
+cflags := $(shell dpkg-buildflags --get CFLAGS)
+cxxflags := $(shell dpkg-buildflags --get CXXFLAGS)
+fflags := $(shell dpkg-buildflags --get FFLAGS)
+ldflags := $(shell dpkg-buildflags --get LDFLAGS)
+ldflags += -Wl,--as-needed
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # add here commands
-# cp debian/config-seq-nosmp.in src/config.in
-# cp debian/config-mpi-nosmp.in src/config.in
- rm -rf install_seq_nosmp
- rm -rf install_mpi_nosmp
- cp debian/ChangeLog ChangeLog
- touch configure-stamp
+DEB_BUILD_ARCH_TYPE=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-build: patch-stamp build-stamp
+%:
+ dh $@ --with quilt
-build-stamp: configure-stamp
- dh_testdir
- # (seq,nosmp)
- cp debian/config-seq-nosmp.in src/config.in
- cd src; $(MAKE) clean; $(MAKE); cd ..
- cp -a install install_seq_nosmp
- # (mpi,nosmp)
- cp debian/config-mpi-nosmp.in src/config.in
- cd src; $(MAKE) clean; $(MAKE); cd ..
- cp -a install install_mpi_nosmp
- touch build-stamp
+override_dh_auto_build:
+ #Build static
+ cp debian/config.in src/config.in
+ perl -pi -e "s|HOSTARCH =.*|HOSTARCH = $(DEB_BUILD_ARCH_TYPE)|" src/config.in
+ dh_auto_build
+
+ #Build shared
+ find src -name \*.o | xargs rm
+ cp debian/config-shared.in src/config.in
+ perl -pi -e "s|HOSTARCH =.*|HOSTARCH = $(DEB_BUILD_ARCH_TYPE)|" src/config.in
+ dh_auto_build
-clean:
- dh_testdir
- dh_testroot
- test -f src/config.in || cp debian/config-seq-nosmp.in src/config.in
- cd src; $(MAKE) clean; cd ..
- rm -f src/config.in
- rm -f src/sopalin/src/murge_fortran.c
- rm -f `find src/ -name "*.d"`
- rm -f `find src/ -name "*.tmp"`
- rm -rf install_seq_nosmp
- rm -rf install_mpi_nosmp
- rm -f ChangeLog
- - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -f patch-stamp
- rm -f build-stamp configure-stamp
- dh_clean
- rm -Rf $(TMPDIR)
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
-
- # add here commands to install the package into DESTDIR
- # $(MAKE) install DESTDIR=$(CURDIR)/$(TMPDIR)
- mkdir -p $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp install/pastix.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp install/pastix_nompi.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp install/pastix_fortran.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp install/murge.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp install/murge.inc $(CURDIR)/$(TMPDIR)/usr/include/pastix
- cp src/sopalin/src/cscd_utils.h $(CURDIR)/$(TMPDIR)/usr/include/pastix
-
- mkdir -p $(CURDIR)/$(TMPDIR)/usr/bin
- cp -p install/pastix-conf $(CURDIR)/$(TMPDIR)/usr/bin/pastix-conf
- mkdir -p $(CURDIR)/$(TMPDIR)/usr/share/man/man1
- cp -p debian/pastix-conf.1 $(CURDIR)/$(TMPDIR)/usr/share/man/man1
- gzip -9 $(CURDIR)/$(TMPDIR)/usr/share/man/man1/*
-
- mkdir -p $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc
- cp -p doc/refcard/refcard.pdf $(CURDIR)/$(TMPDIR)/usr/share/doc/pastix-doc/pastix-refcard.pdf
-
- # (seq/mpi,nosmp)
- mkdir -p $(CURDIR)/$(TMPDIR)/usr/lib
- cp install_seq_nosmp/libpastix.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_seq_nosmp.a
- cp install_seq_nosmp/libpastix_murge.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_seq_nosmp.a
- cp install_mpi_nosmp/libpastix.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_mpi_nosmp.a
- cp install_mpi_nosmp/libpastix_murge.a $(CURDIR)/$(TMPDIR)/usr/lib/libpastix_murge_mpi_nosmp.a
-
- dh_movefiles --sourcedir=$(TMPDIR)
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install --sourcedir=$(TMPDIR)
- dh_lintian
- dh_installinfo
- dh_installman
- dh_installexamples
- dh_makeshlibs
- dh_shlibdeps --dpkg-shlibdeps-params="--ignore-missing-info"
- dh_installdocs
- dh_installchangelogs ChangeLog
- dh_compress -X.pdf
- dh_strip
- dh_link
- dh_fixperms
- dh_installdeb
- dh_gencontrol --dpkg-gencontrol-params="-Tdebian/$(LIBPASTIX).substvars"
- dh_md5sums
- dh_builddeb || true
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
+override_dh_auto_install:
+ #Install static
+ cp debian/config.in src/config.in
+ perl -pi -e "s|HOSTARCH =.*|HOSTARCH = $(DEB_BUILD_ARCH_TYPE)|" src/config.in
+ dh_auto_install
+
+ #Install shared
+ cp debian/config-shared.in src/config.in
+ perl -pi -e "s|HOSTARCH =.*|HOSTARCH = $(DEB_BUILD_ARCH_TYPE)|" src/config.in
+ dh_auto_install
+
+ # Generate doc
+ perl -pi -e "s|-L$(CURDIR)/src/../install||" install/pastix-conf
+ perl -pi -e "s|INC=.*;|INC=\"/usr/include/pastix\"|" install/pastix-conf
+ chmod ugo+x install/pastix-conf
+
+override_dh_auto_clean::
+ cp debian/config.in src/config.in
+ dh_auto_clean
+ -rm -f src/config.in
+
+ # fix lintian errors
+ -rm debian/*.debhelper.log
More information about the debian-science-commits
mailing list