Commit 552aa497 authored by Adam Mercer's avatar Adam Mercer
Browse files

Merge branch 'metaio_version' into 'master'

Metaio version

See merge request !843
parents 4d65a756 9c0c96c8
Pipeline #68207 passed with stages
in 76 minutes and 39 seconds
......@@ -117,7 +117,8 @@ LALSUITE_POP_UVARS
AC_CHECK_LIB([m],[main],,[AC_MSG_ERROR([could not find the math library])])
# metaio
PKG_CHECK_MODULES([METAIO],[libmetaio],[true],[false])
AC_SUBST([MIN_METAIO_VERSION], [8.4.0])
PKG_CHECK_MODULES([METAIO],[libmetaio >= ${MIN_METAIO_VERSION}],[true],[false])
LALSUITE_ADD_FLAGS([C],[${METAIO_CFLAGS}],[${METAIO_LIBS}])
AC_CHECK_LIB([metaio],[MetaioOpen],,[AC_MSG_ERROR([could not find the metaio library])])
......
......@@ -5,7 +5,7 @@ Maintainer: Steffen Grunewald <steffen.grunewald@aei.mpg.de>
Uploaders: Adam Mercer <adam.mercer@ligo.org>, GitLab <gitlab@git.ligo.org>
Build-Depends: debhelper (>= 9),
dh-python,
libmetaio-dev (>= 8.2),
libmetaio-dev (>= @MIN_METAIO_VERSION@),
liboctave-dev,
pkg-config (>= 0.18.0),
python-all-dev,
......@@ -24,7 +24,7 @@ Package: lalmetaio
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
libmetaio1 (>= 8.2),
libmetaio1 (>= @MIN_METAIO_VERSION@),
lal (>= @MIN_LAL_VERSION@~)
Description: LSC Algorithm Library MetaIO
The LSC Algorithm MetaIO Library for gravitational wave data analysis.
......@@ -36,7 +36,7 @@ Section: libdevel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
libmetaio-dev (>= 8.2),
libmetaio-dev (>= @MIN_METAIO_VERSION@),
zlib1g-dev,
lal-dev (>= @MIN_LAL_VERSION@~),
lalmetaio (= ${binary:Version})
......
......@@ -19,7 +19,7 @@ URL: https://wiki.ligo.org/Computing/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: libmetaio-devel
BuildRequires: libmetaio-devel >= @MIN_METAIO_VERSION@
BuildRequires: numpy
BuildRequires: octave-devel
BuildRequires: python-devel
......@@ -27,7 +27,7 @@ BuildRequires: swig >= 3.0.7
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: lal-octave >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
Requires: libmetaio
Requires: libmetaio >= @MIN_METAIO_VERSION@
Requires: lal >= @MIN_LAL_VERSION@
Prefix: %{_prefix}
......@@ -40,7 +40,7 @@ that use the LAL MetaIO library.
Summary: Files and documentation needed for compiling programs that use LAL MetaIO
Group: LAL
Requires: %{name} = %{version}
Requires: libmetaio-devel
Requires: libmetaio-devel >= @MIN_METAIO_VERSION@
Requires: lal-devel >= @MIN_LAL_VERSION@
%description devel
The LSC Algorithm MetaIO Library for gravitational wave data analysis. This
......
......@@ -138,10 +138,7 @@ int XLALLIGOLwHasTable(const char *filename, const char *table_name)
*/
has_table = !MetaioOpenTableOnly(&env, table_name);
/* FIXME: when we can rely on newer versions of libmetaio use this
* function instead of what follows */
/*MetaioClearErrno(&env);*/
env.mierrno = 0;
MetaioClearErrno(&env);
/*
* close
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment