Drop java for i686 (bz#2104085)
This commit is contained in:
parent
d2fb0dab27
commit
f1dc2cf7aa
23
openmpi.spec
23
openmpi.spec
@ -25,12 +25,19 @@
|
|||||||
%bcond_without rdma
|
%bcond_without rdma
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# No more Java on i686
|
||||||
|
%ifarch %{java_arches}
|
||||||
|
%bcond_without java
|
||||||
|
%else
|
||||||
|
%bcond_with java
|
||||||
|
%endif
|
||||||
|
|
||||||
# Run autogen - needed for some patches
|
# Run autogen - needed for some patches
|
||||||
%bcond_with autogen
|
%bcond_with autogen
|
||||||
|
|
||||||
Name: openmpi%{?_cc_name_suffix}
|
Name: openmpi%{?_cc_name_suffix}
|
||||||
Version: 4.1.4
|
Version: 4.1.4
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Open Message Passing Interface
|
Summary: Open Message Passing Interface
|
||||||
License: BSD and MIT and Romio
|
License: BSD and MIT and Romio
|
||||||
URL: http://www.open-mpi.org/
|
URL: http://www.open-mpi.org/
|
||||||
@ -62,7 +69,12 @@ BuildRequires: rdma-core-devel
|
|||||||
BuildRequires: hwloc-devel
|
BuildRequires: hwloc-devel
|
||||||
# So configure can find lstopo
|
# So configure can find lstopo
|
||||||
BuildRequires: hwloc-gui
|
BuildRequires: hwloc-gui
|
||||||
|
%if %{with java}
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
|
%else
|
||||||
|
Obsoletes: %{name}-java < %{version}-%{release}
|
||||||
|
Obsoletes: %{name}-java-devel < %{version}-%{release}
|
||||||
|
%endif
|
||||||
# Old libevent causes issues
|
# Old libevent causes issues
|
||||||
%if !0%{?el7}
|
%if !0%{?el7}
|
||||||
BuildRequires: libevent-devel
|
BuildRequires: libevent-devel
|
||||||
@ -127,6 +139,7 @@ Requires: (python(abi) = %{python3_version} if python3)
|
|||||||
%description devel
|
%description devel
|
||||||
Contains development headers and libraries for openmpi.
|
Contains development headers and libraries for openmpi.
|
||||||
|
|
||||||
|
%if %{with java}
|
||||||
%package java
|
%package java
|
||||||
Summary: Java library
|
Summary: Java library
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
@ -142,6 +155,7 @@ Requires: java-devel
|
|||||||
|
|
||||||
%description java-devel
|
%description java-devel
|
||||||
Contains development wrapper for compiling Java with openmpi.
|
Contains development wrapper for compiling Java with openmpi.
|
||||||
|
%endif
|
||||||
|
|
||||||
# We set this to for convenience, since this is the unique dir we use for this
|
# We set this to for convenience, since this is the unique dir we use for this
|
||||||
# particular package, version, compiler
|
# particular package, version, compiler
|
||||||
@ -183,7 +197,9 @@ OpenMPI support for Python 3.
|
|||||||
--disable-silent-rules \
|
--disable-silent-rules \
|
||||||
--enable-builtin-atomics \
|
--enable-builtin-atomics \
|
||||||
--enable-mpi-cxx \
|
--enable-mpi-cxx \
|
||||||
|
%if %{with java}
|
||||||
--enable-mpi-java \
|
--enable-mpi-java \
|
||||||
|
%endif
|
||||||
--enable-mpi1-compatibility \
|
--enable-mpi1-compatibility \
|
||||||
--with-sge \
|
--with-sge \
|
||||||
--with-valgrind \
|
--with-valgrind \
|
||||||
@ -339,6 +355,7 @@ make check
|
|||||||
%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt
|
%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt
|
||||||
%{macrosdir}/macros.%{namearch}
|
%{macrosdir}/macros.%{namearch}
|
||||||
|
|
||||||
|
%if %{with java}
|
||||||
%files java
|
%files java
|
||||||
%{_libdir}/%{name}/lib/mpi.jar
|
%{_libdir}/%{name}/lib/mpi.jar
|
||||||
|
|
||||||
@ -348,6 +365,7 @@ make check
|
|||||||
# Currently this only contaings openmpi/javadoc
|
# Currently this only contaings openmpi/javadoc
|
||||||
%{_libdir}/%{name}/share/doc/
|
%{_libdir}/%{name}/share/doc/
|
||||||
%{_mandir}/%{namearch}/man1/mpijavac.1.gz
|
%{_mandir}/%{namearch}/man1/mpijavac.1.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
%files -n python2-openmpi
|
%files -n python2-openmpi
|
||||||
@ -361,6 +379,9 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jul 10 2022 Orion Poplawski <orion@nwra.com> - 4.1.4-3
|
||||||
|
- Drop java for i686 (bz#2104085)
|
||||||
|
|
||||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.1.4-2
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.1.4-2
|
||||||
- Rebuilt for Python 3.11
|
- Rebuilt for Python 3.11
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user