Backport a patch from 2.8.4 to fix ASM support.

Thanks to Leon Nardella for heads up. (Closes: #608510, LP: #695335)
ci/unstable
Modestas Vainius 14 years ago
parent 2f19fc7ece
commit 9643b76229

2
debian/changelog vendored

@ -10,6 +10,8 @@ cmake (2.8.3-2) UNRELEASED; urgency=low
* Install cmake documentation into /usr/share/doc/cmake/ and link doc * Install cmake documentation into /usr/share/doc/cmake/ and link doc
directories of the rest binary packages to it (needs debhelper 7.4.2). directories of the rest binary packages to it (needs debhelper 7.4.2).
(LP: #669197) (LP: #669197)
* Backport a patch from 2.8.4 to fix ASM support. Thanks to Leon Nardella for
heads up. (Closes: #608510, LP: #695335)
-- Kai Wasserbäch <debian@carbon-project.org> Fri, 27 Nov 2010 10:41:10 +0100 -- Kai Wasserbäch <debian@carbon-project.org> Fri, 27 Nov 2010 10:41:10 +0100

@ -0,0 +1,27 @@
From: Alex Neundorf <neundorf@kde.org>
Subject: Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
Forwarded: yes
Origin: backport commit:e3dfbf62fcd54f582057fcec7a7989ac73712e55
Bug: http://public.kitware.com/Bug/view.php?id=11467
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608510
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cmake/+bug/695335
Last-Update: 2010-11-17
Applied-Upstream: 2.8.4
CMakeDetermineASMCompiler.cmake relied on that somebody else (usually
during enabling C or CXX) already included that file, and broke if that
was not the case.
Thanks to Louis for the patch
Alex
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -65,6 +65,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version")
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "GNU assembler")
+ INCLUDE(CMakeDetermineCompilerId)
CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT})
IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)

@ -1,3 +1,4 @@
FindPython_fix_#569321_and_#580503.diff FindPython_fix_#569321_and_#580503.diff
fixup_manpages.diff fixup_manpages.diff
FindTCL_fix_#600245.diff FindTCL_fix_#600245.diff
backport_fix_asm_support.diff

Loading…
Cancel
Save