[packages/lal] - fix build on ix86 - updated files

baggins baggins at pld-linux.org
Sun Nov 3 20:03:18 CET 2019


commit d898c8efffc9bbb4cad8e54e31feee720d27cf4d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 3 20:01:39 2019 +0100

    - fix build on ix86
    - updated files

 lal.spec      | 10 +++++++---
 no-simd.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)
---
diff --git a/lal.spec b/lal.spec
index 1967d5a..d156d7c 100644
--- a/lal.spec
+++ b/lal.spec
@@ -9,6 +9,7 @@ Group:		Applications/Science
 Source0:	http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz
 # Source0-md5:	621c8c8758b4bd3d2cbd66727394329e
 Patch0:		%{name}-env.patch
+Patch1:		no-simd.patch
 URL:		https://wiki.ligo.org/DASWG/LALSuite
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
@@ -101,6 +102,9 @@ Wiązania Pythona do bibliotek LAL.
 %prep
 %setup -q
 %patch0 -p1
+%ifarch %{ix86}
+%patch1 -p1
+%endif
 
 %build
 %{__libtoolize}
@@ -133,16 +137,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc AUTHORS README.md
 %{_sysconfdir}/shrc.d/lal-user-env.csh
 %{_sysconfdir}/shrc.d/lal-user-env.fish
 %{_sysconfdir}/shrc.d/lal-user-env.sh
 %attr(755,root,root) %{_bindir}/lal_simd_detect
 %attr(755,root,root) %{_bindir}/lal_version
 %attr(755,root,root) %{_libdir}/liblal.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblal.so.14
+%attr(755,root,root) %ghost %{_libdir}/liblal.so.17
 %attr(755,root,root) %{_libdir}/liblalsupport.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblalsupport.so.11
+%attr(755,root,root) %ghost %{_libdir}/liblalsupport.so.12
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/no-simd.patch b/no-simd.patch
new file mode 100644
index 0000000..0691437
--- /dev/null
+++ b/no-simd.patch
@@ -0,0 +1,55 @@
+--- lal-6.20.2/gnuscripts/lalsuite_build.m4~	2019-05-20 17:00:05.000000000 +0200
++++ lal-6.20.2/gnuscripts/lalsuite_build.m4	2019-11-03 19:52:57.869133016 +0100
+@@ -1294,51 +1294,7 @@
+     m4_pushdef([symbol],m4_translit(iset,[A-Z.],[A-Z_]))
+ 
+     # assume supported until test fails, in which break out of loop
+-    for iset_supported in yes; do
+-
+-      # check -m[]option flag
+-      LALSUITE_CHECK_COMPILE_FLAGS([-m[]option],[],[iset_supported=no])
+-      AS_IF([test x"${iset_supported}" = xno],[break])
+-
+-      # check that compiler defines __]symbol[__ preprocessor symbol
+-      AC_MSG_CHECKING([whether ]_AC_LANG[ compiler defines __]symbol[__ with -m[]option])
+-      CFLAGS="${uvar_orig_prefix[]CFLAGS} -m[]option"
+-      AC_COMPILE_IFELSE([
+-        AC_LANG_PROGRAM([],[[
+-#if !defined(__]]symbol[[__)
+-#error Preprocessor macro not defined by compiler
+-#endif
+-]])
+-      ],[
+-        AC_MSG_RESULT([yes])
+-      ],[
+-        AC_MSG_RESULT([no])
+-        iset_supported=no
+-      ])
+-      AS_IF([test x"${iset_supported}" = xno],[break])
+-
+-      # check that compiler compiles floating-point math with -m[]option
+-      AC_MSG_CHECKING([whether ]_AC_LANG[ compiler compiles floating-point math with -m[]option])
+-      CFLAGS="${uvar_orig_prefix[]CFLAGS} -m[]option"
+-      AC_COMPILE_IFELSE([
+-        AC_LANG_PROGRAM([
+-AC_INCLUDES_DEFAULT
+-#include <math.h>
+-],[[
+-double volatile a = 1.2;
+-double volatile b = 3.4;
+-double volatile c = a * b;
+-double volatile d = round(c);
+-]])
+-      ],[
+-        AC_MSG_RESULT([yes])
+-      ],[
+-        AC_MSG_RESULT([no])
+-        iset_supported=no
+-      ])
+-      AS_IF([test x"${iset_supported}" = xno],[break])
+-
+-    done
++    iset_supported=no
+ 
+     # define Automake conditional HAVE_<SIMD>_COMPILER
+     AM_CONDITIONAL([HAVE_]symbol[_COMPILER],[test x"${iset_supported}" = xyes])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lal.git/commitdiff/d898c8efffc9bbb4cad8e54e31feee720d27cf4d



More information about the pld-cvs-commit mailing list