From fcb650571870704685235c30f969a02ab4765a79 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Aug 04 2020 18:43:13 +0000 Subject: First attempt to fix FTBFS. --- diff --git a/mlpack.spec b/mlpack.spec index f0c1d8b..158eeaa 100644 --- a/mlpack.spec +++ b/mlpack.spec @@ -1,6 +1,6 @@ Name: mlpack Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Scalable, fast C++ machine learning library License: BSD @@ -140,23 +140,27 @@ sed -i 's/WARN_AS_ERROR = YES/WARN_AS_ERROR = NO/' Doxyfile; # On RHEL6, the Boost CMake scripts fail for some reason. I don't have the # time (or patience) to investigate, but if we force CMake to find Boost "the # hard way" by specifying Boost_NO_BOOST_CMAKE=1, it works. -%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ . +%{cmake28} -D Boost_NO_BOOST_CMAKE=1 -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %else -%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ . +%{cmake} -D CMAKE_INSTALL_LIBDIR=%{_libdir} -D DEBUG=OFF -D PROFILE=OFF -D BUILD_TESTS=OFF -D PYTHON_EXECUTABLE=$(which python3) -D BUILD_GO_BINDINGS=OFF -D BUILD_JULIA_BINDINGS=OFF -D STB_IMAGE_INCLUDE_DIR=stb/ %endif # Try and reduce RAM usage. %ifarch armv7hl +cd %{_vpath_builddir}; cmake -D CMAKE_C_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" -D CMAKE_CXX_FLAGS="`echo %{optflags} | sed 's/-pipe//g' | sed 's/$/ --param ggc-min-heapsize=32768 --param ggc-min-expand=1/'`" . +cd ..; %endif # Don't use %make because it could use too much RAM with multiple cores on Koji... -make +%{cmake_build} # Build documentation ('doc' is not in the list of default targets). +cd %{_vpath_builddir}; make doc +cd ..; %install -make DESTDIR=$RPM_BUILD_ROOT install +%{cmake_install} cp stb/stb_image.h $RPM_BUILD_ROOT/%{_includedir}/; cp stb/stb_image_write.h $RPM_BUILD_ROOT/%{_includedir}/; @@ -291,6 +295,9 @@ cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir} %{python3_sitearch}/mlpack-*.egg-info %changelog +* Tue Aug 04 2020 Ryan Curtin - 3.3.2-4 +- Update for CMake out-of-source build fixes. + * Sat Aug 01 2020 Fedora Release Engineering - 3.3.2-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild