[cdo] 07/84: Fix patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdo.
commit 48d1841b7fe54d6a39d83adc0d81fa7c0e6e249f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Dec 29 19:06:42 2012 +0000
Fix patch
---
debian/patches/x.patch | 121 +++----------------------------------------------
1 file changed, 7 insertions(+), 114 deletions(-)
diff --git a/debian/patches/x.patch b/debian/patches/x.patch
index 7749135..f9454bf 100644
--- a/debian/patches/x.patch
+++ b/debian/patches/x.patch
@@ -25,102 +25,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- cdo-1.5.6.1+dfsg.1.orig/config/default
-+++ cdo-1.5.6.1+dfsg.1/config/default
-@@ -17,32 +17,17 @@ fi
- set -x
- #
- case "${HOSTNAME}" in
-- icc)
-- ${CONFPATH}configure --prefix=$HOME/local \
-- --enable-maintainer-mode \
-- --with-jasper=$HOME/local \
-- --with-grib_api=$HOME/local/gribapi-1.9.16cgribex \
-- --with-netcdf=$HOME/local \
-- --with-hdf5=$HOME/local \
-- --with-szlib=$HOME/local \
-- --with-proj=/opt/local \
-- --with-magics=/Users/m214003/local/magics-2.14.9 \
-- CC=icc CFLAGS="-g -D_REENTRANT -Wall -W -O3 -openmp -DHAVE_LIBXML -I/usr/include/libxml2 -I/opt/include" \
-- LIBS="-L/usr/lib -lxml2 -L/opt/local/lib -lopenjpeg"
-- ;;
- # i386-apple-darwin10
- bailung*)
- ${CONFPATH}configure --prefix=$HOME/local \
- --enable-maintainer-mode \
- --with-jasper=$HOME/local \
-- --with-grib_api=$HOME/local/gribapi-1.9.16cgribex \
-+ --with-grib_api=$HOME/local \
- --with-netcdf=$HOME/local \
- --with-hdf5=$HOME/local \
- --with-szlib=$HOME/local \
- --with-proj=/opt/local \
-- --with-magics=/Users/m214003/local/magics-2.14.9 \
-- CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -fopenmp -DHAVE_LIBXML -I/usr/include/libxml2 -I/opt/include" \
-- LIBS="-L/usr/lib -lxml2 -L/opt/local/lib -lopenjpeg"
-+ CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
- ;;
- hama*)
- ${CONFPATH}configure --prefix=$HOME/local \
-@@ -52,7 +37,7 @@ case "${HOSTNAME}" in
- --with-netcdf=/opt/local \
- --with-szlib=$HOME/local \
- --with-proj=/opt/local \
-- CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -fopenmp"
-+ CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
- ;;
- # ia64-xxx-linux
- ds*)
-@@ -70,33 +55,30 @@ case "${HOSTNAME}" in
- tornado*)
- ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/sles10-x64 \
- --enable-all-static \
-- --with-netcdf=/sw/sles10-x64/netcdf-4.2-static \
-- --with-hdf5=/sw/sles10-x64/hdf5-1.8.8-static \
-+ --with-netcdf=/sw/sles10-x64/netcdf-4.0.1 \
-+ --with-hdf5=/sw/sles10-x64/hdf5-1.8.2 \
- --with-szlib=/sw/sles10-x64/szip-2.1 \
- CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
- # CC=suncc CFLAGS="-g -fast -xopenmp"
- ;;
--# x86_64-squeeze-x64-linux
-- thunder*)
-- ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/squeeze-x64 \
-- --with-jasper=/sw/squeeze-x64/jasper-1.900.1-static \
-- --with-grib_api=/sw/squeeze-x64/grib_api-1.9.9-static \
-- --with-netcdf=/sw/squeeze-x64/netcdf-4.2-static \
-- --with-hdf5=/sw/squeeze-x64/hdf5-1.8.8-static \
-- --with-szlib=/sw/squeeze-x64/szip-2.1 \
-- --with-proj=/sw/squeeze-x64/proj-4.7.0 \
-- CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
-- ;;
-+# x86_64-etch-x64-linux
-+# squall*)
-+# ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-x64 \
-+# --enable-all-static \
-+# --with-netcdf=/sw/etch-x64/netcdf-4.0.1 \
-+# --with-hdf5=/sw/etch-x64/hdf5-1.8.2 \
-+# --with-szlib=/sw/etch-x64/szip-2.1-static \
-+# --with-proj=/sw/etch-x64/proj-4.7.0 \
-+# CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
-+# ;;
- # x86_64-lenny-linux-gnu
- squall*)
- ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/lenny-x64 \
-- --with-jasper=/sw/lenny-x64/jasper-1.900.1-static \
-- --with-grib_api=/sw/lenny-x64/grib_api-1.9.9-static \
-- --with-netcdf=/sw/lenny-x64/netcdf-4.2-static \
-- --with-hdf5=/sw/lenny-x64/hdf5-1.8.8-static \
-+ --with-netcdf=/sw/lenny-x64/netcdf-4.0.1-gcc \
-+ --with-hdf5=/sw/lenny-x64/hdf5-1.8.4p1-gcc \
- --with-szlib=/sw/lenny-x64/szip-2.1 \
- --with-proj=/sw/lenny-x64/proj-4.7.0 \
-- CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
-+ CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
- ;;
- # x86_64-archlinux
- thingol*)
-@@ -121,6 +103,19 @@ case "${HOSTNAME}" in
+Index: cdo-1.5.9+dfsg.1/config/default
+===================================================================
+--- cdo-1.5.9+dfsg.1.orig/config/default 2012-12-29 19:03:28.000000000 +0000
++++ cdo-1.5.9+dfsg.1/config/default 2012-12-29 19:04:42.000000000 +0000
+@@ -129,6 +129,19 @@
--with-szlib=$HOME/local \
CC=colorgcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
;;
@@ -140,7 +49,7 @@ Last-Update: <YYYY-MM-DD>
# standard workstations at MPI-M x86_64-lenny
mpipc* )
${CONFPATH}configure \
-@@ -172,13 +167,13 @@ case "${HOSTNAME}" in
+@@ -180,13 +193,13 @@
;;
# x86_64-unknown-linux-gnu (rhel55)
lizard*)
@@ -156,20 +65,4 @@ Last-Update: <YYYY-MM-DD>
+ --with-hdf5=/sw/rhel55-x64/hdf5-1.8.5-threadsafe \
--with-szlib=/sw/rhel55-x64/szip-2.1 \
--with-zlib=/usr \
- CC=gcc44 CFLAGS="-g -Wall -O2 -fopenmp"
-@@ -198,10 +193,11 @@ case "${HOSTNAME}" in
- blizzard*)
- ${CONFPATH}configure --prefix=$HOME/local \
- --with-jasper=/sw/aix53/jasper-1.900.1 \
-- --with-grib_api=/sw/aix61/grib_api-1.9.9 \
-- --with-netcdf=/sw/aix61/netcdf-4.2-threadsafe \
-- --with-hdf5=/sw/aix61/hdf5-1.8.8-threadsafe \
-- --with-szlib=/sw/aix61/szip-2.1-threadsafe \
-+ --with-grib_api=/sw/aix61/ECMWF \
-+ --with-netcdf=/sw/aix61/netcdf-4.1.2-hdf5-threadsafe \
-+ --with-hdf5=/sw/aix61/hdf5-1.8.6-threadsafe \
-+ --with-zlib=/sw/aix53/zlib-1.2.3 \
-+ --with-szlib=/sw/aix53/szip-2.1 \
- --with-proj=/sw/aix53/proj-4.6.1 \
- AR="ar -X 64" LDFLAGS="-brtl" \
- CC=xlc_r CFLAGS="-g -O3 -q64 -qhot -qstrict -qarch=auto -qtune=auto -qsmp=omp -DHAVE_MMAP -qthreaded"
+ CC=gcc44 CFLAGS="-g -Wall -O2 -fopenmp"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list