[arch-commits] Commit in cmake/trunk (2 files)

[Felix Yan]

    Date: Friday, November 20, 2015 @ 10:44:48
  Author: fyan
Revision: 251687

upgpkg: cmake 3.4.0-2

add a patch for FS#47113

Added:
  cmake/trunk/fix-c-c++-default-dialect-detection.patch
Modified:
  cmake/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   10 +++++--
 fix-c-c++-default-dialect-detection.patch |   39 ++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-20 09:42:21 UTC (rev 251686)
+++ PKGBUILD	2015-11-20 09:44:48 UTC (rev 251687)
@@ -5,7 +5,7 @@
 
 pkgname=cmake
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -15,11 +15,15 @@
 optdepends=('qt5-base: cmake-gui'
             'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cd3034e0a44256a0917e254167217fc8')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+        fix-c-c++-default-dialect-detection.patch)
+md5sums=('cd3034e0a44256a0917e254167217fc8'
+         'a2c3f0abf120a6dc8e142aa23dba1520')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  # FS#47113
+  patch -p1 -i ../fix-c-c++-default-dialect-detection.patch
 }
 
 build() {

Added: fix-c-c++-default-dialect-detection.patch
===================================================================
--- fix-c-c++-default-dialect-detection.patch	                        (rev 0)
+++ fix-c-c++-default-dialect-detection.patch	2015-11-20 09:44:48 UTC (rev 251687)
@@ -0,0 +1,39 @@
+From: Setze Post <cmake at sietze.uk>
+Date: Tue, 17 Nov 2015 16:59:05 +0000 (-0500)
+Subject: Make C and C++ default dialect detection robust to advanced optimizations
+X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=716a09b9
+
+Make C and C++ default dialect detection robust to advanced optimizations
+
+In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
+for the compiler, 2015-09-15) we added an "INFO:..." string to the
+compiler id detection binary.  The value can be optimized out of the
+compiler id binary unless we force it to be included by making the
+program behavior depend on it at runtime.  Add references to the value
+as we do for the other info strings already.
+---
+
+diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
+index b224007..63f8787 100644
+--- a/Modules/CMakeCCompilerId.c.in
++++ b/Modules/CMakeCCompilerId.c.in
+@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+   require += info_simulate_version[argc];
+ #endif
++  require += info_language_dialect_default[argc];
+   (void)argv;
+   return require;
+ }
+diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
+index d467507..61cd790 100644
+--- a/Modules/CMakeCXXCompilerId.cpp.in
++++ b/Modules/CMakeCXXCompilerId.cpp.in
+@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+   require += info_simulate_version[argc];
+ #endif
++  require += info_language_dialect_default[argc];
+   (void)argv;
+   return require;
+ }