[gcc-6] 343/401: * Don't add the configured prefix to libcc1's compiler name. Closes: #851146.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 638542a0de06f3bf1ef47e2142dbe62ca906ccd2
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Jan 12 13:06:01 2017 +0000

      * Don't add the configured prefix to libcc1's compiler name.
        Closes: #851146.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9223 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                         |  2 ++
 debian/patches/libcc1-compiler-name.diff | 24 ++++++++++++++++++++++++
 debian/rules.patch                       |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dd06682..0527a2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ gcc-6 (6.3.0-3) UNRELEASED; urgency=medium
   * Reapply the fix for PR target/55947, and fix PR c++/72813, taken from
     the trunk.
   * Fix PR target/79044 (PPC), ICE (Bill Schmidt). Closes: #850777.
+  * Don't add the configured prefix to libcc1's compiler name.
+    Closes: #851146.
 
  -- Matthias Klose <doko at debian.org>  Thu, 12 Jan 2017 13:04:12 +0100
 
diff --git a/debian/patches/libcc1-compiler-name.diff b/debian/patches/libcc1-compiler-name.diff
new file mode 100644
index 0000000..242f191
--- /dev/null
+++ b/debian/patches/libcc1-compiler-name.diff
@@ -0,0 +1,24 @@
+# DP: Don't add the configured prefix to libcc1's compiler name.
+
+--- a/src/libcc1/Makefile.am
++++ b/src/libcc1/Makefile.am
+@@ -49,7 +49,7 @@
+ # Put this in a header so we don't run sed for each compilation.  This
+ # is also simpler to debug as one can easily see the constant.
+ compiler-name.h: Makefile
+-	echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@
++	echo "#define COMPILER_NAME \"`echo gcc-6`\"" > $@
+ 
+ 
+ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
+--- a/src/libcc1/Makefile.in
++++ b/src/libcc1/Makefile.in
+@@ -674,7 +674,7 @@
+ # Put this in a header so we don't run sed for each compilation.  This
+ # is also simpler to debug as one can easily see the constant.
+ compiler-name.h: Makefile
+-	echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@
++	echo "#define COMPILER_NAME \"`echo gcc-6`\"" > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/rules.patch b/debian/rules.patch
index 397dfe3..92c3926 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -110,6 +110,7 @@ debian_patches += \
 	CVE-2016-9843 \
 	pr72813 \
 	pr79044 \
+	libcc1-compiler-name \
 
 ifeq ($(libstdcxx_abi),new)
   debian_patches += libstdc++-functexcept

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