From 7646225e408f9a4ffc8163487534a412c60de08e5703bf6ce78b4da2d388d271 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 8 Jun 2020 14:18:25 +0000 Subject: [PATCH] Accepting request 812057 from home:badshah400:branches:science Add lal-implicit-conversion-XLALError.patch to fix an implicit conversion error flagged by GCC 10. OBS-URL: https://build.opensuse.org/request/show/812057 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=3 --- lal-implicit-conversion-XLALError.patch | 13 +++++++++++++ lal.changes | 6 ++++++ lal.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 lal-implicit-conversion-XLALError.patch diff --git a/lal-implicit-conversion-XLALError.patch b/lal-implicit-conversion-XLALError.patch new file mode 100644 index 0000000..755e667 --- /dev/null +++ b/lal-implicit-conversion-XLALError.patch @@ -0,0 +1,13 @@ +Index: lal-6.22.0/lib/std/XLALError.h +=================================================================== +--- lal-6.22.0.orig/lib/std/XLALError.h ++++ lal-6.22.0/lib/std/XLALError.h +@@ -698,7 +698,7 @@ void XLALError(const char *func, + *
  • \b ... (Optional) Additional arguments for printf-like format. + * + */ +-#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return XLAL_FAILURE, __VA_ARGS__) ++#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return (LALTYPECODE)XLAL_FAILURE, __VA_ARGS__) + + /** + * Macro to invoke a failure from a XLAL routine returning a pointer. diff --git a/lal.changes b/lal.changes index d86b7fd..988bdd9 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 6 12:09:59 UTC 2020 - Atri Bhattacharya + +- Add lal-implicit-conversion-XLALError.patch to fix an implicit + conversion error flagged by GCC 10. + ------------------------------------------------------------------- Fri May 15 13:07:39 UTC 2020 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index f307608..41107c6 100644 --- a/lal.spec +++ b/lal.spec @@ -25,6 +25,8 @@ License: GPL-2.0-only Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/DASWG/LALSuite Source: http://software.ligo.org/lscsoft/source/lalsuite/lal-%{version}.tar.xz +# PATCH-FIX-UPSTREAM lal-implicit-conversion-XLALError.patch badshah400@gmail.com -- Fix an implicit coversion issue flagged by GCC 10 +Patch0: lal-implicit-conversion-XLALError.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module lscsoft-glue} BuildRequires: %{python_module numpy-devel}