[ncl] 02/03: Patch: ensure triple2grid.f compiled -fPIC

Alastair McKinstry mckinstry at moszumanska.debian.org
Mon Jul 31 12:49:40 UTC 2017


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

mckinstry pushed a commit to branch debian/master
in repository ncl.

commit be680a366f33b31b2f6805ab6241a2923a1dd75f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 31 12:21:57 2017 +0100

    Patch: ensure triple2grid.f compiled -fPIC
---
 debian/changelog                     |  1 +
 debian/patches/fix-triple2grid.patch | 18 ++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c56dd5..ff43140 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ncl (6.4.0-2) UNRELEASED; urgency=medium
   * Standards-Version: 4.0.0; no changes required
   * Add gbp.conf file
   * Debhelper compat=10
+  * Patch: ensure triple2grid.f compiled -fPIC
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 24 Jul 2017 09:53:20 +0100
 
diff --git a/debian/patches/fix-triple2grid.patch b/debian/patches/fix-triple2grid.patch
new file mode 100644
index 0000000..7e309d2
--- /dev/null
+++ b/debian/patches/fix-triple2grid.patch
@@ -0,0 +1,18 @@
+Description: Ensure all objs built with -fPIC to fix FTBFS
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-07-31
+Forwarded: no
+
+Index: ncl-6.4.0/ni/src/lib/nfpfort/yMakefile
+===================================================================
+--- ncl-6.4.0.orig/ni/src/lib/nfpfort/yMakefile
++++ ncl-6.4.0/ni/src/lib/nfpfort/yMakefile
+@@ -51,7 +51,7 @@ LibraryTarget($(MYNAME),$(OBJS))
+ BuildSharedLibTarget(libNGnfpfort,$(FOBJS),1,0,$(NCARGLIB) $(NCARGGKSLIB) $(NCARGCLIB) $(CTOFLIBS) -llapack -lblas -lfftpack5_dp -lsphere3.1_dp -lm -lc)
+ 
+ triple2grid.o: triple2grid.f
+-        $(F77) -g -c triple2grid.f
++        $(F77) $(FFLAGS) -g -c triple2grid.f
+ 
+ calc_uh.o: calc_uh.f90
+         $(F77) $(FFLAGS) -c calc_uh.f90
diff --git a/debian/patches/series b/debian/patches/series
index c26c4b3..d74286f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ deblibs.patch
 reproducible.patch
 remove-jasper.patch
 rm-iconv.patch
+fix-triple2grid.patch
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ncl.git



More information about the debian-science-commits mailing list