Verified Commit 9f56ab2d authored by Duncan Macleod's avatar Duncan Macleod
Browse files

lalframe: update build for new framel package names

parent 9e4b757b
......@@ -33,11 +33,11 @@ requirements:
host:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
run:
- lal >={{ lal_version }}a0
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
test:
source_files:
......@@ -81,7 +81,7 @@ outputs:
- lal >={{ lal_version }}a0
- {{ pin_subpackage('lalframe', exact=True) }}
- ldas-tools-framecpp >={{ framecpp_version }}
- libframe
- libframel
- {{ pin_compatible('numpy') }}
- python
- python-lal >={{ lal_version }}a0
......
......@@ -42,8 +42,10 @@ AM_INIT_AUTOMAKE([ \
# version requirements
MIN_LAL_VERSION="6.21.0"
MIN_FRAMECPPC_VERSION="2.5.5"
MIN_FRAMEL_VERSION="8.39.2"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_FRAMECPPC_VERSION])
AC_SUBST([MIN_FRAMEL_VERSION])
AC_CANONICAL_HOST
......@@ -147,9 +149,9 @@ AS_IF([test "${framec}" = "true"], [
AS_IF([test "${framel}" = "true"], [
FRAMEL_AVAILABLE="yes"
PKG_CHECK_MODULES([LIBFRAME],[libframe],[true],[false])
LALSUITE_ADD_FLAGS([C],[${LIBFRAME_CFLAGS}],[${LIBFRAME_LIBS}])
AC_CHECK_LIB([Frame],[FrLibIni],,[FRAMEL_AVAILABLE="no"])
PKG_CHECK_MODULES([FRAMEL],[framel],[true],[false])
LALSUITE_ADD_FLAGS([C],[${FRAMEL_CFLAGS}],[${FRAMEL_LIBS}])
AC_CHECK_LIB([framel],[FrLibIni],,[FRAMEL_AVAILABLE="no"])
AC_CHECK_HEADERS([FrameL.h],,[FRAMEL_AVAILABLE="no"])
])
......@@ -164,7 +166,7 @@ AS_IF([test "${FRAMEC_AVAILABLE}" = "yes"],
)
AS_IF([test "${FRAMEL_AVAILABLE}" = "yes"],
[AC_SUBST([PC_REQUIRES_FRAMEL], [", libframe"])],
[AC_SUBST([PC_REQUIRES_FRAMEL], [", framel"])],
[AC_SUBST([PC_REQUIRES_FRAMEL], [""])]
)
......
......@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
pkg-config (>= 0.18.0),
lal-dev (>= @MIN_LAL_VERSION@~),
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
libframel-dev (>= @MIN_FRAMEL_VERSION@),
liboctave-dev,
zlib1g-dev,
swig (>= 3.0.9) | swig3.0 (>= 3.0.9),
......@@ -36,7 +36,7 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c (>= @MIN_FRAMECPPC_VERSION@),
libframe1 (>= 8.0),
libframel8 (>= @MIN_FRAMEL_VERSION@),
lal (>= @MIN_LAL_VERSION@~)
Description: LSC Algorithm Library Frame
The LSC Algorithm Frame Library for gravitational wave data analysis.
......@@ -49,7 +49,7 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
libframel-dev (>= @MIN_FRAMEL_VERSION@),
zlib1g-dev,
lal-dev (>= @MIN_LAL_VERSION@~),
lalframe (= ${binary:Version})
......
......@@ -23,12 +23,12 @@ Prefix: %{_prefix}
# -- build requirements -----
# C
BuildRequires: libframel-devel >= @MIN_FRAMEL_VERSION@
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: help2man
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
BuildRequires: libframe-devel
BuildRequires: make
BuildRequires: pkgconfig >= 0.18.0
......@@ -60,9 +60,9 @@ BuildRequires: lal-octave >= @MIN_LAL_VERSION@
# -- packages ---------------
# lalframe
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframe
Requires: lal >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c >= @MIN_FRAMECPPC_VERSION@
Requires: libframel >= @MIN_FRAMEL_VERSION@
%description
The LSC Algorithm Frame Library for gravitational wave data analysis. This
......@@ -74,9 +74,9 @@ that use the LAL Frame library.
Summary: Files and documentation needed for compiling programs that use LAL Frame
Group: LAL
Requires: %{name} = %{version}
Requires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
Requires: libframe-devel
Requires: libframel-devel >= @MIN_FRAMEL_VERSION@
Requires: lal-devel >= @MIN_LAL_VERSION@
Requires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
%description devel
The LSC Algorithm Frame Library for gravitational wave data analysis. This
package contains files needed build applications that use the LAL Frame
......
......@@ -31,7 +31,7 @@ enum {
};
/* enable FrameL support if available */
#if defined HAVE_FRAMEL_H && defined HAVE_LIBFRAME
#if defined HAVE_FRAMEL_H && defined HAVE_FRAMEL
# include "LALFrameUFrameL.h"
# define CASE_FRAMEL(errval, function, ...) case LAL_FRAMEU_FRAME_LIBRARY_FRAMEL: return function ## _FrameL_ (__VA_ARGS__)
# ifndef LAL_FRAMEU_FRAME_LIBRARY_DEFAULT
......@@ -88,7 +88,7 @@ static int XLALFrameLibrary(void)
const char *env = getenv("LAL_FRAME_LIBRARY");
if (env) {
if (strcmp(env, "FrameL") == 0) {
#if defined HAVE_FRAMEL_H && defined HAVE_LIBFRAME
#if defined HAVE_FRAMEL_H && defined HAVE_FRAMEL
lalFrameLibrary = LAL_FRAMEU_FRAME_LIBRARY_FRAMEL;
#else
XLAL_ERROR_VAL(LAL_FRAMEU_FRAME_LIBRARY_UNAVAILABLE, XLAL_ESYS,
......
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