[cdo] 25/84: Add disable-tests patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:26 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 cd959c74ae3be3624f1fc9465ceb7a28a72a7950
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jun 20 04:10:42 2013 +0100
Add disable-tests patch
---
debian/changelog | 7 ++++
debian/patches/disable-tests.patch | 18 ++++++++++
debian/patches/series | 1 +
debian/patches/x.patch | 68 -------------------------------------
debian/patches/y.patch | 69 --------------------------------------
debian/rules | 3 +-
6 files changed, 28 insertions(+), 138 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3651e20..5f502a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cdo (1.6.0+dfsg.1-4) unstable; urgency=low
+
+ * Fix as-needed. Use dh_autoreconf.
+ * Disable tests, to fix FTBFS due to auto* tools build issue.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 20 Jun 2013 21:09:17 +0100
+
cdo (1.6.0+dfsg.1-3) unstable; urgency=low
* Add build declaration to silence warning.
diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch
new file mode 100644
index 0000000..071f4f1
--- /dev/null
+++ b/debian/patches/disable-tests.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: For some reason, top_srcdir support is broken in auto*. Disable tests.
+Last-Updated: 2013-06-20
+Forwarded: no
+
+Index: cdo-1.6.0+dfsg.1/test/Makefile.am
+===================================================================
+--- cdo-1.6.0+dfsg.1.orig/test/Makefile.am 2013-06-20 02:55:11.000000000 +0100
++++ cdo-1.6.0+dfsg.1/test/Makefile.am 2013-06-20 03:03:17.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ export
+
+-TESTS = $(top_srcdir)/test/test_info.py
++# TESTS = $(top_srcdir)/test/test_info.py
+
+ # $(top_srcdir)/test/test_diff.py
+ # $(top_srcdir)/test/test_Arith.py
diff --git a/debian/patches/series b/debian/patches/series
index 320335d..0179dea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix_typos.patch
ignore.patch
build-fixes.patch
+disable-tests.patch
diff --git a/debian/patches/x.patch b/debian/patches/x.patch
deleted file mode 100644
index f9454bf..0000000
--- a/debian/patches/x.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- cdo (1.5.6.1+dfsg.1-1) unstable; urgency=low
- .
- * New upstream release
- * Standards-Version: 3.9.3
- * Don't use MPI builds. PIO code not included yet.
-Author: Alastair McKinstry <mckinstry at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-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>
-
-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"
- ;;
-+# i686-linux
-+ etch-ia32 | gata)
-+ ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \
-+ --enable-maintainer-mode \
-+ --with-jasper=/sw/etch-ia32/jasper-1.900.1 \
-+ --with-grib_api=$HOME/local/etch-ia32/grib_api-1.9.9 \
-+ --with-netcdf=/sw/etch-ia32/netcdf-4.1.1-gcc \
-+ --with-hdf5=/sw/etch-ia32/hdf5-1.8.4-threadsafe \
-+ --with-zlib=/sw/etch-ia32/zlib-1.2.3 \
-+ --with-szlib=$HOME/local/etch-ia32 \
-+ --with-proj=/sw/etch-ia32/proj-4.6.0 \
-+ CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2"
-+ ;;
- # standard workstations at MPI-M x86_64-lenny
- mpipc* )
- ${CONFPATH}configure \
-@@ -180,13 +193,13 @@
- ;;
- # x86_64-unknown-linux-gnu (rhel55)
- lizard*)
-- LDFLAGS="-lpng"
-+ LDFLAGS="-Wl,-rpath=/sw/rhel55-x64/jasper-1.900.1/lib:/sw/rhel55-x64/hdf5-1.8.5-threadsafe/lib:/sw/rhel55-x64/szip-2.1/lib:/sw/rhel55-x64/netcdf-4.1.1/lib -lpng"
- export LDFLAGS
- ${CONFPATH}configure --prefix=$HOME/local/rhel55-x64 \
- --with-jasper=/sw/rhel55-x64/jasper-1.900.1 \
- --with-grib_api=/sw/rhel55-x64/grib_api-1.9.0 \
-- --with-netcdf=/sw/rhel55-x64/netcdf-4.2 \
-- --with-hdf5=/sw/rhel55-x64/hdf5-1.8.8-threadsafe \
-+ --with-netcdf=/sw/rhel55-x64/netcdf-4.1.1 \
-+ --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"
diff --git a/debian/patches/y.patch b/debian/patches/y.patch
deleted file mode 100644
index f9cd23c..0000000
--- a/debian/patches/y.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- cdo (1.5.6.1+dfsg.1-1) unstable; urgency=low
- .
- * New upstream release
- * Standards-Version: 3.9.3
- * Don't use MPI builds. PIO code not included yet.
-Author: Alastair McKinstry <mckinstry at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-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/m4/acx_options.m4
-+++ cdo-1.5.6.1+dfsg.1/m4/acx_options.m4
-@@ -339,39 +339,6 @@ AC_ARG_WITH([proj],
- [AC_MSG_CHECKING([for the PROJ library])
- AC_MSG_RESULT([suppressed])])
- # ----------------------------------------------------------------------
--# Compile application with MAGICS
--MAGICS_ROOT=''
--MAGICS_INCLUDE=''
--MAGICS_LIBS=''
--AC_ARG_WITH([magics],
-- [AS_HELP_STRING([--with-magics=<yes|no|directory>],[location of magics library (lib and include subdirs)])],
-- [AS_CASE(["$with_magics"],
-- [no],[AC_MSG_CHECKING([for magics library])
-- AC_MSG_RESULT([suppressed])],
-- [yes],[AC_CHECK_HEADERS([magics_api.h])
-- AC_SEARCH_LIBS([mag_open],
-- [MagPlus],
-- [AC_DEFINE([HAVE_LIBMAGICS],[1],[Define to 1 for MAGICS support])],
-- [AC_MSG_ERROR([Could not link to magics library])])
-- AC_SUBST([MAGICS_LIBS],[" -lMagPlus"])],
-- [*],[AS_IF([test -d "$with_magics"],
-- [MAGICS_ROOT=$with_magics
-- LDFLAGS="-L$MAGICS_ROOT/lib $LDFLAGS"
-- CPPFLAGS="-I$MAGICS_ROOT/include/magics $CPPFLAGS"
-- AC_CHECK_HEADERS([magics_api.h])
-- AC_SEARCH_LIBS([mag_open],
-- [MagPlus],
-- [AC_DEFINE([HAVE_LIBMAGICS],[1],[Define to 1 for MAGICS support])],
-- [AC_MSG_ERROR([Could not link to magics library])])
-- MAGICS_LIBS=" -L$MAGICS_ROOT/lib -lMagPlus"
-- MAGICS_INCLUDE=" -I$MAGICS_ROOT/include/magics"],
-- [AC_MSG_NOTICE([$with_magics is not a directory! MAGICS suppressed])])])],
-- [AC_MSG_CHECKING([for MAGICS library])
-- AC_MSG_RESULT([suppressed])])
--AC_SUBST([MAGICS_ROOT])
--AC_SUBST([MAGICS_INCLUDE])
--AC_SUBST([MAGICS_LIBS])
--# ----------------------------------------------------------------------
- # How to build CDI into CDO?
- INTERNAL_CDI_DIR=libcdi
- # At the moment, there are two possible CDI bindings
diff --git a/debian/rules b/debian/rules
index 645655d..e099005 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,8 @@ override_dh_auto_configure:
--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr --with-proj=/usr --with-hdf5=/usr \
--enable-iso-c-interface --with-magics=/usr \
$(WITH_GRIB) $(WITH_JASPER) FC=gfortran \
- LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl"
+ LIBS="-Wl,-Bstatic -lpng12 -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \
+ LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
#rm -f libtool libcdi/libtool
#ln -sf /usr/bin/libtool libtool
#ln -sf /usr/bin/libtool libcdi/libtool
--
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