Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
8f47e8e38a
GPG Key ID:
8B7F1DA0E2C9FDBB
@ -1,21 +1,22 @@
|
||||
Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake
|
||||
Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
===================================================================
|
||||
--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake
|
||||
+++ cmake-3.17.0-rc1/Modules/FindRuby.cmake
|
||||
@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
|
||||
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
|
||||
--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
|
||||
+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
||||
@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
||||
_RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
|
||||
_RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
|
||||
|
||||
- # vendor_ruby available ?
|
||||
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||
- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||
- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||
-
|
||||
- if(RUBY_HAS_VENDOR_RUBY)
|
||||
- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||
- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||
- if(Ruby_HAS_VENDOR_RUBY)
|
||||
- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
||||
- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
||||
- endif()
|
||||
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||
+ # vendor_ruby
|
||||
+ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
||||
+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
||||
|
||||
# save the results in the cache so we don't have to run ruby the next time again
|
||||
set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
||||
set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
||||
|
||||
74
cmake.spec
74
cmake.spec
@ -17,11 +17,7 @@
|
||||
%bcond_without git_test
|
||||
|
||||
# Set to bcond_with or use --without gui to disable qt4 gui build
|
||||
%ifnarch riscv64
|
||||
%bcond_without gui
|
||||
%else
|
||||
%bcond_with gui
|
||||
%endif
|
||||
|
||||
# Use ncurses for colorful output
|
||||
%bcond_without ncurses
|
||||
@ -59,19 +55,22 @@
|
||||
%{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}}
|
||||
|
||||
%global major_version 3
|
||||
%global minor_version 17
|
||||
%global minor_version 18
|
||||
# Set to RC version if building RC, else %%{nil}
|
||||
#global rcsuf rc3
|
||||
#global rcsuf rc1
|
||||
%{?rcsuf:%global relsuf .%{rcsuf}}
|
||||
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 1
|
||||
|
||||
# Uncomment if building for EPEL
|
||||
#global name_suffix %%{major_version}
|
||||
%global orig_name cmake
|
||||
|
||||
Name: %{orig_name}%{?name_suffix}
|
||||
Version: %{major_version}.%{minor_version}.3
|
||||
Release: 2%{?relsuf}.0.riscv64%{?dist}
|
||||
Version: %{major_version}.%{minor_version}.1
|
||||
Release: %{baserelease}%{?relsuf}%{?dist}
|
||||
Summary: Cross-platform make system
|
||||
|
||||
# most sources are BSD
|
||||
@ -103,7 +102,6 @@ Patch101: %{name}-fedora-flag_release.patch
|
||||
# https://gitlab.kitware.com/cmake/cmake/issues/17600
|
||||
Patch102: %{name}-mingw-dl.patch
|
||||
|
||||
|
||||
# Patch for renaming on EPEL
|
||||
%if 0%{?name_suffix:1}
|
||||
Patch1: %{name}-rename.patch
|
||||
@ -146,6 +144,7 @@ BuildRequires: libuv-devel
|
||||
BuildRequires: rhash-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: vim-filesystem
|
||||
%endif
|
||||
%if %{with emacs}
|
||||
BuildRequires: emacs
|
||||
@ -207,6 +206,7 @@ Requires: %{name}-rpm-macros = %{version}-%{release}
|
||||
Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}}
|
||||
%endif
|
||||
%endif
|
||||
Requires: vim-filesystem
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -315,11 +315,12 @@ do
|
||||
done
|
||||
%if %{with emacs}
|
||||
# Install emacs cmake mode
|
||||
mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name}
|
||||
install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
|
||||
mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} %{buildroot}%{_emacs_sitestartdir}
|
||||
mv %{buildroot}%{_emacs_sitelispdir}/%{name}-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
|
||||
%{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el
|
||||
mkdir -p %{buildroot}%{_emacs_sitestartdir}
|
||||
install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
|
||||
%else
|
||||
rm -f %{buildroot}%{_emacs_sitelispdir}
|
||||
%endif
|
||||
# RPM macros
|
||||
install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name}
|
||||
@ -464,6 +465,8 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
%{_emacs_sitestartdir}
|
||||
%endif
|
||||
%endif
|
||||
%{vimfiles_root}/indent/%{name}.vim
|
||||
%{vimfiles_root}/syntax/%{name}.vim
|
||||
|
||||
|
||||
%files doc
|
||||
@ -501,8 +504,51 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jun 06 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.17.3-2.0.riscv64
|
||||
- Disable Qt GUI
|
||||
* Sat Aug 01 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.1-1
|
||||
- Update to 3.18.1
|
||||
|
||||
* Wed Jul 29 2020 Orion Poplawski <orion@nwra.com> - 3.18.0-5
|
||||
- Handle arguments for ctest3 macro
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-3
|
||||
- Default to --verbose for ctest as well
|
||||
|
||||
* Sun Jul 19 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-2
|
||||
- Make in-source builds behave like before
|
||||
|
||||
* Sat Jul 18 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-1.1
|
||||
- Enable out-of-source builds by default
|
||||
|
||||
* Thu Jul 16 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-1
|
||||
- Update to 3.18.0
|
||||
|
||||
* Sat Jul 04 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.8.rc3
|
||||
- Update to 3.18.0-rc3
|
||||
|
||||
* Fri Jul 03 2020 Neal Gompa <ngompa13@gmail.com> - 3.18.0-0.7.rc2
|
||||
- Switch to implementation that is backwards compatible to older RPM
|
||||
- Change control macro for in-source/out-of-source to %%__cmake_in_source_build
|
||||
|
||||
* Fri Jul 03 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.6.rc2
|
||||
- Add out-of-source builds controlled by a macro (%%__cmake_out_of_source_build)
|
||||
|
||||
* Wed Jul 01 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.18.0-0.5.rc2
|
||||
- Undo out-of-source-builds
|
||||
|
||||
* Tue Jun 30 2020 Tom Callaway <spot@fedoraproject.org> - 3.18.0-0.4.rc2
|
||||
- fix FindLua to support lua 5.4
|
||||
|
||||
* Mon Jun 29 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.3.rc2
|
||||
- Apply change: CMake to do out-of-source builds (#1852036)
|
||||
|
||||
* Sat Jun 20 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.2.rc2
|
||||
- Update to 3.18.0-rc2
|
||||
|
||||
* Fri Jun 12 2020 Björn Esser <besser82@fedoraproject.org> - 3.18.0-0.1.rc1
|
||||
- Update to 3.18.0-rc1
|
||||
|
||||
* Sat May 30 2020 Björn Esser <besser82@fedoraproject.org> - 3.17.3-2
|
||||
- Rebuild (jsoncpp)
|
||||
|
||||
21
macros.cmake
21
macros.cmake
@ -6,6 +6,8 @@
|
||||
%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
|
||||
%_cmake_version @@CMAKE_VERSION@@
|
||||
%__cmake /usr/bin/cmake
|
||||
%__ctest /usr/bin/ctest
|
||||
%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
|
||||
|
||||
# - Set default compile flags
|
||||
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
|
||||
@ -24,6 +26,8 @@
|
||||
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
|
||||
%endif \
|
||||
%__cmake \\\
|
||||
%{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
|
||||
%{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
|
||||
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
||||
@ -36,6 +40,21 @@
|
||||
%if "%{?_lib}" == "lib64" \
|
||||
%{?_cmake_lib_suffix64} \\\
|
||||
%endif \
|
||||
%{?_cmake_shared_libs}
|
||||
%{?_cmake_shared_libs}
|
||||
|
||||
%cmake_build \
|
||||
%__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
|
||||
|
||||
%cmake_install \
|
||||
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
|
||||
|
||||
%ctest(:-:) \
|
||||
cd "%{__cmake_builddir}" \
|
||||
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} --verbose %{**} \
|
||||
cd -
|
||||
|
||||
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
|
||||
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
|
||||
%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cmake-3.17.3.tar.gz) = 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
|
||||
SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
|
||||
|
||||
Loading…
Reference in New Issue
Block a user