testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 407851 from home:mathletic:branches:devel:tools:building

Browse Source 
replace openSuse-specific patch by reduced patch from upstream. If it was reduced to far, we have to modify it and try to upstream it again.

OBS-URL: https://build.opensuse.org/request/show/407851
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=256
This commit is contained in:
Martin Pluskal 2016-07-12 06:38:28 +00:00 committed by Git OBS Bridge
parent cc2d407a76
commit 6b48c28e79
5 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake-gui.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 12 05:26:59 UTC 2016 - foss@grueninger.de
- While upstreaming cmake-version-in-generated-files.patch, the
CMake developer Brad King reduced the patch
-------------------------------------------------------------------
Mon Jul 11 17:28:35 UTC 2016 - mpluskal@suse.com

2
cmake-gui.spec
View File

@ -31,7 +31,7 @@ Source7: cmake.keyring
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS
# PATCH-FIX-UPSTREAM cmake-version-in-generated-files.patch -- version number to be found in OBS
Patch6: cmake-version-in-generated-files.patch
BuildRequires: curl-devel
BuildRequires: fdupes

85
cmake-version-in-generated-files.patch
View File

@ -1,8 +1,22 @@
Enclosing the cmake version will cause a republish of generated files
From c376c5bca204a689b5bcfec88291b8bc7f226e7f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
Date: Sun, 10 Jul 2016 15:35:24 +0200
Subject: [PATCH] Do not place CMake version in export files
--- cmake-3.6.0/Source/cmExportFileGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/cmExportFileGenerator.cxx 2016-07-10 09:43:06.902186709 +0200
@@ -93,7 +93,7 @@
Files generated by `install(EXPORT)` and `export_library_dependencies()`
may be installed with packages and consumed by dependents. In order to
avoid re-building dependents only because the version of CMake changed,
drop the CMake version from the export file content.
---
Source/cmExportFileGenerator.cxx | 2 +-
Source/cmExportLibraryDependenciesCommand.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d93e406..e00af5e 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -93,7 +93,7 @@ bool cmExportFileGenerator::GenerateImportFile()
// Protect that file against use with older CMake versions.
/* clang-format off */
@ -11,10 +25,11 @@ Enclosing the cmake version will cause a republish of generated files
os << "if(\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" LESS 2.5)\n"
<< " message(FATAL_ERROR \"CMake >= 2.6.0 required\")\n"
<< "endif()\n";
diff -ru cmake-3.6.0/Source/cmExportLibraryDependenciesCommand.cxx cmake-3.6.0_patched/Source/cmExportLibraryDependenciesCommand.cxx
--- cmake-3.6.0/Source/cmExportLibraryDependenciesCommand.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/cmExportLibraryDependenciesCommand.cxx 2016-07-10 09:43:59.719118260 +0200
@@ -152,7 +152,7 @@
diff --git a/Source/cmExportLibraryDependenciesCommand.cxx b/Source/cmExportLibraryDependenciesCommand.cxx
index c8272cb..b422a2c 100644
--- a/Source/cmExportLibraryDependenciesCommand.cxx
+++ b/Source/cmExportLibraryDependenciesCommand.cxx
@@ -152,7 +152,7 @@ void cmExportLibraryDependenciesCommand::ConstFinalPass() const
// versions.
const char* vertest =
"\"${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}\" GREATER 2.4";
@ -23,55 +38,5 @@ diff -ru cmake-3.6.0/Source/cmExportLibraryDependenciesCommand.cxx cmake-3.6.0_p
fout << "if(" << vertest << ")\n";
fout << " # Information for CMake 2.6 and above.\n";
for (std::map<std::string, std::string>::const_iterator i =
diff -ru cmake-3.6.0/Source/cmGlobalGhsMultiGenerator.cxx cmake-3.6.0_patched/Source/cmGlobalGhsMultiGenerator.cxx
--- cmake-3.6.0/Source/cmGlobalGhsMultiGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/cmGlobalGhsMultiGenerator.cxx 2016-07-10 09:40:07.711043443 +0200
@@ -333,8 +333,8 @@
(*os) << "#" << std::endl
<< "# CMAKE generated file: DO NOT EDIT!" << std::endl
<< "# Generated by \"" << GetActualName() << "\""
- << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "."
- << cmVersion::GetMinorVersion() << std::endl
+ << " Generator, CMake"
+ << std::endl
<< "#" << std::endl;
}
diff -ru cmake-3.6.0/Source/cmGlobalNinjaGenerator.cxx cmake-3.6.0_patched/Source/cmGlobalNinjaGenerator.cxx
--- cmake-3.6.0/Source/cmGlobalNinjaGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/cmGlobalNinjaGenerator.cxx 2016-07-10 09:45:27.428670193 +0200
@@ -807,8 +807,7 @@
{
os << "# CMAKE generated file: DO NOT EDIT!\n"
<< "# Generated by \"" << this->GetName() << "\""
- << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "."
- << cmVersion::GetMinorVersion() << "\n\n";
+ << " Generator, CMake\n\n";
}
void cmGlobalNinjaGenerator::AddDependencyToAll(cmGeneratorTarget* target)
diff -ru cmake-3.6.0/Source/cmLocalUnixMakefileGenerator3.cxx cmake-3.6.0_patched/Source/cmLocalUnixMakefileGenerator3.cxx
--- cmake-3.6.0/Source/cmLocalUnixMakefileGenerator3.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/cmLocalUnixMakefileGenerator3.cxx 2016-07-10 09:46:19.413592894 +0200
@@ -1878,8 +1878,7 @@
{
os << "# CMAKE generated file: DO NOT EDIT!\n"
<< "# Generated by \"" << this->GlobalGenerator->GetName() << "\""
- << " Generator, CMake Version " << cmVersion::GetMajorVersion() << "."
- << cmVersion::GetMinorVersion() << "\n\n";
+ << " Generator, CMake\n\n";
}
std::string cmLocalUnixMakefileGenerator3::GetRecursiveMakeCall(
diff -ru cmake-3.6.0/Source/CPack/IFW/cmCPackIFWGenerator.cxx cmake-3.6.0_patched/Source/CPack/IFW/cmCPackIFWGenerator.cxx
--- cmake-3.6.0/Source/CPack/IFW/cmCPackIFWGenerator.cxx 2016-07-07 16:47:27.000000000 +0200
+++ cmake-3.6.0_patched/Source/CPack/IFW/cmCPackIFWGenerator.cxx 2016-07-10 09:41:34.316559270 +0200
@@ -560,7 +560,7 @@
void cmCPackIFWGenerator::WriteGeneratedByToStrim(cmXMLWriter& xout)
{
std::stringstream comment;
- comment << "Generated by CPack " << CMake_VERSION << " IFW generator "
+ comment << "Generated by CPack IFW generator "
<< "for QtIFW ";
if (IsVersionLess("2.0")) {
comment << "less 2.0";
--
1.7.10.4

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 12 05:13:19 UTC 2016 - foss@grueninger.de
- While upstreaming cmake-version-in-generated-files.patch, the
CMake developer Brad King reduced the patch
-------------------------------------------------------------------
Mon Jul 11 17:28:01 UTC 2016 - mpluskal@suse.com

2
cmake.spec
View File

@ -36,7 +36,7 @@ Patch2: cmake-fix-ruby-test.patch
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
Patch5: system-libs.patch
# PATCH-FIX-SUSE cmake-version-in-generated-files.patch -- version number to be found in OBS
# PATCH-FIX-UPSTREAM cmake-version-in-generated-files.patch -- version number to be found in OBS
Patch6: cmake-version-in-generated-files.patch
BuildRequires: curl-devel
BuildRequires: fdupes