rpms
/
cmake
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add patch to use ninja-build (bug #886184)

This commit is contained in:
Orion Poplawski 2013-02-08 09:35:42 -07:00
parent 556b25d625
commit c3e8dd85cf
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmake-ninja.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake
--- cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake.ninja 2012-11-27 06:26:32.000000000 -0700
+++ cmake-2.8.10.2/Modules/CMakeNinjaFindMake.cmake 2013-02-08 09:30:26.437739370 -0700
@@ -12,6 +12,6 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-find_program(CMAKE_MAKE_PROGRAM ninja
+find_program(CMAKE_MAKE_PROGRAM ninja-build
DOC "Program used to build from build.ninja files.")
mark_as_advanced(CMAKE_MAKE_PROGRAM)
diff -up cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx
--- cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx.ninja 2012-11-27 06:26:33.000000000 -0700
+++ cmake-2.8.10.2/Source/cmGlobalNinjaGenerator.cxx 2013-02-08 09:32:30.397949661 -0700
@@ -1034,7 +1034,7 @@ std::string cmGlobalNinjaGenerator::ninj
lgen->GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"),
cmLocalGenerator::SHELL);
}
- return "ninja";
+ return "ninja-build";
}
void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)

11
cmake.spec
View File

@ -8,7 +8,7 @@
Name: cmake
Version: 2.8.10.2
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@ -25,6 +25,9 @@ Patch0: cmake-dcmtk.patch
# Patch to fix RindRuby vendor settings
# http://public.kitware.com/Bug/view.php?id=12965
# https://bugzilla.redhat.com/show_bug.cgi?id=822796
# Patch to use ninja-build instead of ninja (renamed in Fedora)
# https://bugzilla.redhat.com/show_bug.cgi?id=886184
Patch1: cmake-ninja.patch
Patch2: cmake-findruby.patch
# Patch to fix FindPostgreSQL
# https://bugzilla.redhat.com/show_bug.cgi?id=828467
@ -83,6 +86,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%prep
%setup -q -n %{name}-%{version}%{?rcver}
%patch0 -p1 -b .dcmtk
%patch1 -p1 -b .ninja
%patch2 -p1 -b .findruby
%patch3 -p1 -b .findpostgresql
%patch4 -p1 -b .ccmake-del
@ -182,7 +186,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
* Thu Jan 24 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.1-3
* Fri Feb 8 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.2-4
- Add patch to use ninja-build (bug #886184)
* Thu Jan 24 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.10.2-3
- Update FindPostgreSQL patch to use PostgreSQL_LIBRARY (bug #903757)
* Thu Jan 17 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.8.10.2-2