[cmor] 01/12: 2.9.1-5

Alastair McKinstry mckinstry at moszumanska.debian.org
Mon Aug 8 08:05:50 UTC 2016


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

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

commit 1864b6f27241c5d11b578f7af0e785e73fa33f96
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 15 09:00:33 2015 +0100

    2.9.1-5
---
 debian/patches/ncldflags.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/debian/patches/ncldflags.patch b/debian/patches/ncldflags.patch
new file mode 100644
index 0000000..1e530e6
--- /dev/null
+++ b/debian/patches/ncldflags.patch
@@ -0,0 +1,42 @@
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748947
+Description: Add support for ${EXTRA_NCLDFLAGS}, needed for ppc64el
+Forwarded: no
+Last-Updated: 2014-07-11
+
+Index: cmor-2.9.1/configure.ac
+===================================================================
+--- cmor-2.9.1.orig/configure.ac
++++ cmor-2.9.1/configure.ac
+@@ -217,27 +217,27 @@ if [ test ${with_netcdfb} != "-yes" ]; t
+     AC_CHECK_FILE([${with_netcdf}/bin/nc-config],[HAS_NCCONFIG=yes],[HAS_NCCONFIG=no])
+     if [ test ${HAS_NCCONFIG} == "yes" ] ; then 
+       NCCFLAGS=`${with_netcdf}/bin/nc-config --cflags`
+-      NCLDFLAGS=`${with_netcdf}/bin/nc-config --libs`
++      NCLDFLAGS="`${with_netcdf}/bin/nc-config --libs` ${EXTRA_NCLDFLAGS}"
+     else 
+      NCCFLAGS=" -I${with_netcdf}/include"
+      if [ test ${RTAG} != "none" ] ; then
+       NCLDFLAGS=" -L${with_netcdf}/lib  ${RTAG}${with_netcdf}/lib -lnetcdf"
+      else
+-      NCLDFLAGS=" -L${with_netcdf}/lib -lnetcdf"
++      NCLDFLAGS=" -L${with_netcdf}/lib -lnetcdf ${EXTRA_NCLDFLAGS}"
+      fi
+     fi
+   else
+     NCCFLAGS="-lnetcdf"
+-    NCLDFLAGS=""
++    NCLDFLAGS="${EXTRA_NCLDFLAGS}"
+   fi
+ else
+   AC_PATH_PROG(NCCONFIG,nc-config,"no")
+   if [ test NCCONFIG != "no" ] ; then
+    NCCFLAGS=`${NCCONFIG} --cflags`
+-   NCLDFLAGS=`${NCCONFIG} --libs`
++   NCLDFLAGS="`${NCCONFIG} --libs` ${EXTRA_NCLDFLAGS}"
+   else
+    NCCFLAGS="-lnetcdf"
+-   NCLDFLAGS=""
++   NCLDFLAGS="${EXTRA_NCLDFLAGS}"
+   fi
+ fi
+ 

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



More information about the debian-science-commits mailing list