[debhelper-devel] [debhelper] 01/01: cross cmake should specify existing compilers

Niels Thykier nthykier at moszumanska.debian.org
Mon Feb 22 22:25:18 UTC 2016


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 61d575451f028e2bba666d40ee1dedc8c6308f40
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Wed Jan 20 23:58:23 2016 +0100

    cross cmake should specify existing compilers
    
    It seems that cross symlinks for $triplet-cc and $triplet-c++ are no
    longer generated in the gcc-defaults. Thus switch to the canonical gcc
    compiler names.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 4 ++--
 debian/changelog                      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index f4d5c3c..98631e7 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -67,12 +67,12 @@ sub configure {
 		if ($ENV{CC}) {
 			push @flags, "-DCMAKE_C_COMPILER=" . $ENV{CC};
 		} else {
-			push @flags, "-DCMAKE_C_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-cc";
+			push @flags, "-DCMAKE_C_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-gcc";
 		}
 		if ($ENV{CXX}) {
 			push @flags, "-DCMAKE_CXX_COMPILER=" . $ENV{CXX};
 		} else {
-			push @flags, "-DCMAKE_CXX_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-c++";
+			push @flags, "-DCMAKE_CXX_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++";
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 42c0eab..9b1eb99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ debhelper (9.20160116) UNRELEASED; urgency=medium
   * dh_installdeb: In compat 10, avoid adding two comments per line
     in the maintscript file.  Thanks to Didier Raboud for
     reporting the bug.  (Closes: #615854)
+  * cmake.pm: Apply patch from Helmut Grohne to correct the
+    name of the default cross compilers.  (Closes: #812136)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 16 Jan 2016 13:23:00 +0000
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list