[med-svn] [phast] 02/02: Use clapack lib names

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository phast.

commit 49376e71740e6b3d97ba15d0569ac28cc1525863
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 3 07:25:12 2016 +0200

    Use clapack lib names
---
 debian/patches/clapack.patch | 50 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/debian/patches/clapack.patch b/debian/patches/clapack.patch
index c305c1c..472fcc5 100644
--- a/debian/patches/clapack.patch
+++ b/debian/patches/clapack.patch
@@ -6,16 +6,46 @@ Description: Debian's clapack package renames library from lapack.a
 
 --- a/src/lib/Makefile
 +++ b/src/lib/Makefile
-@@ -19,10 +19,10 @@ sharedlib: liblinks sharedphastlib
- # by default, CLAPACK uses non-standard library names, which confuses
- # the compiler.  We'll just create symbolic links in ${PHAST}/lib that
- # have proper names
--liblinks: ${PHAST}/lib/liblapack.a ${PHAST}/lib/libtmg.a \
-+liblinks: ${PHAST}/lib/libclapack.a ${PHAST}/lib/libtmg.a \
- 	${PHAST}/lib/libblaswr.a 
+@@ -12,29 +12,9 @@ endif
+ 
+ ifdef CLAPACKPATH		# only do below if using CLAPACK
  
+-all: liblinks phastlib
+-
+-sharedlib: liblinks sharedphastlib
+-
+-# by default, CLAPACK uses non-standard library names, which confuses
+-# the compiler.  We'll just create symbolic links in ${PHAST}/lib that
+-# have proper names
+-liblinks: ${PHAST}/lib/liblapack.a ${PHAST}/lib/libtmg.a \
+-	${PHAST}/lib/libblaswr.a 
+-
 -${PHAST}/lib/liblapack.a: ${CLAPACKPATH}/lapack${PLAT}.a
-+${PHAST}/lib/liblapack.a: ${CLAPACKPATH}/clapack${PLAT}.a
- 	mkdir -p ${PHAST}/lib
- 	${LN} -s $< $@
+-	mkdir -p ${PHAST}/lib
+-	${LN} -s $< $@
+-
+-${PHAST}/lib/libtmg.a: ${CLAPACKPATH}/tmglib${PLAT}.a
+-	mkdir -p ${PHAST}/lib
+-	${LN} -s $< $@
+-
+-${PHAST}/lib/libblaswr.a: ${CLAPACKPATH}/blas${PLAT}.a
+-	mkdir -p ${PHAST}/lib
+-	${LN} -s $< $@
++all: phastlib
+ 
+-else				# no CLAPACK: links not necessary
++sharedlib: sharedphastlib
+ 
+ all: phastlib
  
+--- a/src/make-include.mk
++++ b/src/make-include.mk
+@@ -140,7 +140,7 @@ else
+ ifdef CLAPACKPATH
+ ifneq ($(TARGETOS), Windows)
+   CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH}
+-  LIBS = -lphast -llapack -ltmg -lblaswr -lc -lf2c -lm
++  LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm
+ else
+   CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH} -DPCRE_STATIC
+   LIBS = -lphast -lm  ${CLAPACKPATH}/liblapack.a ${CLAPACKPATH}/libf2c.a ${CLAPACKPATH}/libblas.a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/phast.git