Compare commits
1 Commits
master
...
f33-riscv6
Author | SHA1 | Date |
---|---|---|
|
398c8736f9 |
20
cmake.spec
20
cmake.spec
|
@ -62,7 +62,7 @@
|
|||
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 3
|
||||
%global baserelease 2
|
||||
|
||||
# Uncomment if building for EPEL
|
||||
#global name_suffix %%{major_version}
|
||||
|
@ -70,7 +70,7 @@
|
|||
|
||||
Name: %{orig_name}%{?name_suffix}
|
||||
Version: %{major_version}.%{minor_version}.4
|
||||
Release: %{baserelease}%{?relsuf}%{?dist}
|
||||
Release: %{baserelease}%{?relsuf}.0.riscv64%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
# most sources are BSD
|
||||
|
@ -427,6 +427,14 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
|
|||
mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
|
||||
%endif
|
||||
pushd %{_vpath_builddir}
|
||||
# QEMU is slow thus a test timesout:
|
||||
# 549 - Qt5Autogen.Complex (Timeout)
|
||||
# 552 - Qt5Autogen.ManySources (Timeout)
|
||||
# 581 - Qt5Autogen.MocInclude (Timeout)
|
||||
# 582 - Qt5Autogen.MocIncludeSymlink (Timeout)
|
||||
%ifarch riscv64
|
||||
TEST_TIMEOUT="--timeout 3000"
|
||||
%endif
|
||||
# CTestTestUpload require internet access
|
||||
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
|
||||
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
|
||||
|
@ -438,9 +446,9 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
|
|||
%if %{with bootstrap}
|
||||
NO_TEST="$NO_TEST|curl"
|
||||
%endif
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" $TEST_TIMEOUT --output-on-failure
|
||||
# Keep an eye on failing tests
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || :
|
||||
bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" $TEST_TIMEOUT --output-on-failure || :
|
||||
popd
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
|
@ -512,8 +520,8 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 20 08:32:34 EST 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.4-3
|
||||
- Ensure CMake does not strip binaries with package builds
|
||||
* Sat Nov 28 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.18.4-2.0.riscv64
|
||||
- Increase timeout for tests to 3000 seconds on riscv64 (2x increase)
|
||||
|
||||
* Mon Nov 09 2020 Miro Hrončok <mhroncok@redhat.com> - 3.18.4-2
|
||||
- Add support for Python 3.10
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
|
||||
# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS
|
||||
# - Turn on verbose makefiles so we can see and verify compile flags
|
||||
# - Turn off stripping by default so RPM can do it separately
|
||||
# - Set default install prefixes and library install directories
|
||||
# - Turn on shared libraries by default
|
||||
%cmake \
|
||||
|
@ -33,7 +32,6 @@
|
|||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
|
||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
|
||||
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
|
||||
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
|
||||
|
|
Loading…
Reference in New Issue