[med-svn] [phast] 07/07: Add -lpcre for proper linking

[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 087e25a29f5c4ac38b0f9071d5d326ce61493bec
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 3 23:08:42 2016 +0200

    Add -lpcre for proper linking
---
 debian/patches/fix_include.patch                 | 2 +-
 debian/patches/use_debian_packaged_libpcre.patch | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/fix_include.patch b/debian/patches/fix_include.patch
index c07104f..8e9e381 100644
--- a/debian/patches/fix_include.patch
+++ b/debian/patches/fix_include.patch
@@ -5,7 +5,7 @@
  ifdef CLAPACKPATH
  ifneq ($(TARGETOS), Windows)
 -  CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH}
-   LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm
+   LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm -lpcre
  else
 -  CFLAGS += -I${CLAPACKPATH}/INCLUDE
    LIBS = -lphast -lm  ${CLAPACKPATH}/liblapack.a ${CLAPACKPATH}/libf2c.a ${CLAPACKPATH}/libblas.a
diff --git a/debian/patches/use_debian_packaged_libpcre.patch b/debian/patches/use_debian_packaged_libpcre.patch
index 83f367e..4e70797 100644
--- a/debian/patches/use_debian_packaged_libpcre.patch
+++ b/debian/patches/use_debian_packaged_libpcre.patch
@@ -9,9 +9,12 @@
  LIBPATH = -L${LIB} 
  
  # uncomment these lines for profiling (add -g for line-by-line
-@@ -140,7 +140,7 @@ ifneq ($(TARGETOS), Windows)
+@@ -138,9 +138,9 @@ else
+ ifdef CLAPACKPATH
+ ifneq ($(TARGETOS), Windows)
    CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH}
-   LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm
+-  LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm
++  LIBS = -lphast -lclapack -lctmg -lcblas -lc -lf2c -lm -lpcre
  else
 -  CFLAGS += -I${CLAPACKPATH}/INCLUDE -DPCRE_STATIC
 +  CFLAGS += -I${CLAPACKPATH}/INCLUDE

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