-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update lalapps to version 7.2.0 / rev 4 via SR 919087
https://build.opensuse.org/request/show/919087 by user badshah400 + dimstar_suse
- Loading branch information
1 parent
05b1f59
commit 56c7f10
Showing
5 changed files
with
57 additions
and
1 deletion.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
packages/l/lalapps/lalapps-disable-testWeave-for-non-x86_64.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Index: lalapps-7.2.0/src/pulsar/Weave/Makefile.am | ||
=================================================================== | ||
--- lalapps-7.2.0.orig/src/pulsar/Weave/Makefile.am | ||
+++ lalapps-7.2.0/src/pulsar/Weave/Makefile.am | ||
@@ -75,5 +75,10 @@ if !CFITSIO | ||
skip_tests += $(test_scripts) | ||
endif | ||
|
||
+# Skip Weave tests on non-x86_64 | ||
+if SKIP_WEAVE_TESTS | ||
+skip_tests += $(test_scripts) | ||
+endif | ||
+ | ||
# testWeave_reference_results.sh requires output from tests that compare against reference results | ||
testWeave_reference_results.log: testWeave_interpolating.log testWeave_non_interpolating.log testWeave_single_segment.log | ||
Index: lalapps-7.2.0/configure.ac | ||
=================================================================== | ||
--- lalapps-7.2.0.orig/configure.ac | ||
+++ lalapps-7.2.0/configure.ac | ||
@@ -318,6 +318,13 @@ AM_CPPFLAGS="-I\$(top_srcdir)/src ${AM_C | ||
# RedHat-derived systems. | ||
AC_SUBST([pkgpythondir], ["\${pkgpyexecdir}"]) | ||
|
||
+# testWeave_* results have tolerance issues that show up in some archs, use only for x86_64 | ||
+# See https://git.ligo.org/lscsoft/lalsuite/-/issues/105 | ||
+AC_MSG_CHECKING([if arch is non-x86_64 so weave tests should be disabled]) | ||
+AC_DEFINE([SKIP_WEAVE_TESTS], [0], [Set to 1 for non-x86_64 architectures]) | ||
+AS_IF([test x"$(arch)" != "xx86_64"], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) | ||
+AM_CONDITIONAL([SKIP_WEAVE_TESTS], [test x"$(arch)" != "xx86_64"]) | ||
+ | ||
# output | ||
AC_OUTPUT | ||
AC_MSG_NOTICE([ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,12 @@ | ||
------------------------------------------------------------------- | ||
Mon Sep 13 13:58:08 UTC 2021 - Atri Bhattacharya <[email protected]> | ||
|
||
- Add lalapps-disable-testWeave-for-non-x86_64.patch: Disable | ||
Weave related tests on all but x86_64 where tolerance errors | ||
show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105, | ||
boo#1189928; introduces BuildRequires: libtool and requires | ||
running autoreconf before configure. | ||
|
||
------------------------------------------------------------------- | ||
Tue Jun 8 20:51:27 UTC 2021 - Atri Bhattacharya <[email protected]> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,8 @@ Source: http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{versi | |
Patch0: lalapps-fix-uninitialised-var.patch | ||
# PATCH-FIX-UPSTREAM lalapps-gcc11-array-bounds-decl.patch [email protected] -- Fix building with gcc 11 by correcting array bounds declaration; patch part of upstream merge request [https://git.ligo.org/lscsoft/lalsuite/-/merge_requests/1605] | ||
Patch1: lalapps-gcc11-array-bounds-decl.patch | ||
# PATCH-FIX-UPSTREAM lalapps-disable-testWeave-for-non-x86_64.patch [email protected] -- Disable Weave related tests on all but x86_64 where tolerance errors show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105 | ||
Patch2: lalapps-disable-testWeave-for-non-x86_64.patch | ||
BuildRequires: %{python_module astropy} | ||
BuildRequires: %{python_module devel} | ||
BuildRequires: %{python_module glue} | ||
|
@@ -67,6 +69,9 @@ BuildRequires: bc | |
BuildRequires: lalpulsar-data | ||
Requires: python3-%{name} = %{version} | ||
# /SECTION | ||
# SECTION Required for Patch2 | ||
BuildRequires: libtool | ||
# /SECTION | ||
# 32-bit no longer supported upstream | ||
ExcludeArch: %{ix86} | ||
%define python_subpackage_only 1 | ||
|
@@ -110,14 +115,15 @@ sed -Ei "1{s|/usr/bin/env python|%{_bindir}/python3|}" \ | |
src/pulsar/HeterodyneSearch/make_frame_cache | ||
|
||
%build | ||
# Patch2 touches autotool files | ||
autoreconf -fvi | ||
%{python_expand # Necessary to run %%configure for all active python flavors | ||
export PYTHON=%{_bindir}/$python | ||
mkdir ../$python | ||
cp -pr ./ ../$python | ||
pushd ../$python | ||
# FIXME: Failures because XLAL_ERROR implictly converts to function return type | ||
export CFLAGS+=" -Wno-enum-conversion" | ||
%configure \ | ||
%configure --enable-swig | ||
%make_build | ||
popd | ||
|