[gcc-6] 390/401: * Install the gcov-dump utility.

[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 2d79426b1d214f2ec385bd66e42ad6fa627b602f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Mar 15 12:21:14 2017 +0000

      * Install the gcov-dump utility.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9363 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                      |  1 +
 debian/patches/install-gcov-dump.diff | 34 ++++++++++++++++++++++++++++++++++
 debian/rules.d/binary-gcc.mk          |  4 ++--
 debian/rules.patch                    |  1 +
 debian/rules2                         |  4 ++--
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8e61d2..e917fdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ gcc-6 (6.3.0-9) UNRELEASED; urgency=medium
   * Fix symlinks to man pages in the hppa64 package. Closes: #857583.
   * Don't ship the gnatgcc manpage symlink when building GFDL packages.
     Closes: #857384.
+  * Install the gcov-dump utility.
 
  -- Matthias Klose <doko at debian.org>  Mon, 13 Mar 2017 12:57:04 +0100
 
diff --git a/debian/patches/install-gcov-dump.diff b/debian/patches/install-gcov-dump.diff
new file mode 100644
index 0000000..451cdb8
--- /dev/null
+++ b/debian/patches/install-gcov-dump.diff
@@ -0,0 +1,34 @@
+# DP: Install gcov-dump.
+
+gcc/ChangeLog:
+
+2017-03-14  Martin Liska  <mliska at suse.cz>
+
+	* Makefile.in: Install gcov-dump.
+
+--- a/src/gcc/Makefile.in
++++ b/src/gcc/Makefile.in
+@@ -806,6 +806,7 @@ GCC_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcc|sed '$(progra
+ CPP_INSTALL_NAME := $(shell echo cpp|sed '$(program_transform_name)')
+ GCOV_INSTALL_NAME := $(shell echo gcov|sed '$(program_transform_name)')
+ GCOV_TOOL_INSTALL_NAME := $(shell echo gcov-tool|sed '$(program_transform_name)')
++GCOV_DUMP_INSTALL_NAME := $(shell echo gcov-dump|sed '$(program_transform_name)')
+ 
+ # Setup the testing framework, if you have one
+ EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
+@@ -3519,6 +3520,15 @@ install-common: native lang.install-common installdirs
+ 	    gcov-tool$(exeext) $(DESTDIR)$(bindir)/$(GCOV_TOOL_INSTALL_NAME)$(exeext); \
+ 	  fi; \
+ 	fi
++# Install gcov-dump if it was compiled.
++	-if test "$(enable_as_accelerator)" != "yes" ; then \
++	  if [ -f gcov-dump$(exeext) ]; \
++	  then \
++	    rm -f $(DESTDIR)$(bindir)/$(GCOV_DUMP_INSTALL_NAME)$(exeext); \
++	    $(INSTALL_PROGRAM) \
++	    gcov-dump$(exeext) $(DESTDIR)$(bindir)/$(GCOV_DUMP_INSTALL_NAME)$(exeext); \
++	  fi; \
++	fi
+ 
+ # Install the driver program as $(target_noncanonical)-gcc,
+ # $(target_noncanonical)-gcc-$(version), and also as gcc if native.
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 6b5acff..c3e6b02 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -35,7 +35,7 @@ dirs_gcc = \
 
 # XXX: what about triarch mapping?
 files_gcc = \
-	$(PF)/bin/$(cmd_prefix){gcc,gcov,gcov-tool}$(pkg_ver) \
+	$(PF)/bin/$(cmd_prefix){gcc,gcov,gcov-tool,gcov-dump}$(pkg_ver) \
 	$(PF)/bin/$(cmd_prefix)gcc-{ar,ranlib,nm}$(pkg_ver) \
 	$(PF)/share/man/man1/$(cmd_prefix)gcc-{ar,nm,ranlib}$(pkg_ver).1 \
 	$(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \
@@ -136,7 +136,7 @@ endif
 	$(dh_compat2) dh_movefiles -p$(p_gcc) $(files_gcc)
 
 ifeq ($(unprefixed_names),yes)
-	for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
+	for i in gcc gcov gcov-dump gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
 	  ln -sf $(cmd_prefix)$$i$(pkg_ver) \
 	    $(d_gcc)/$(PF)/bin/$$i$(pkg_ver); \
 	done
diff --git a/debian/rules.patch b/debian/rules.patch
index da4ee15..df27211 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -109,6 +109,7 @@ debian_patches += \
 	mips-pr78176-add-mlxc1-sxc1 \
 	mips-loongson3a-use-fused-madd.d \
 	mips-madd4 \
+	install-gcov-dump \
 
 ifeq ($(libstdcxx_abi),new)
   debian_patches += libstdc++-functexcept
diff --git a/debian/rules2 b/debian/rules2
index bd3f53d..092c0c6 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2119,7 +2119,7 @@ ifeq ($(with_hppa64),yes)
 	rm -rf $(d)/$(PF)/share/info
 	rm -rf $(d)/$(PF)/share/man
 	rm -f $(d)/$(PF)/$(libdir)/libiberty.a
-	rm -f $(d)/$(PF)/bin/*{gcov,gcov-tool,gccbug,gcc}
+	rm -f $(d)/$(PF)/bin/*{gcov,gcov-dump,gcov-tool,gccbug,gcc}
 
 	rm -rf $(d)/$(PF)/hppa64-linux-gnu/include
 	rm -rf $(d)/$(PF)/hppa64-linux-gnu/lib
@@ -2455,7 +2455,7 @@ $(install_hppa64_stamp): $(build_hppa64_stamp)
 	rm -rf $(d_hppa64)/$(PF)/lib/gcc/hppa64-linux-gnu/$(BASE_VERSION)/plugin
 	rm -f $(d_hppa64)/$(PF)/lib/libiberty.a
 	rm -f $(d_hppa64)/$(PF)/lib/libcc1.*
-	rm -f $(d_hppa64)/$(PF)/bin/*{gcov,gcov-tool,gccbug,gcc}
+	rm -f $(d_hppa64)/$(PF)/bin/*{gcov,gcov-dump,gcov-tool,gccbug,gcc}
 
 	rm -rf $(d_hppa64)/$(PF)/hppa64-linux-gnu
 	rm -rf $(d_hppa64)/$(PF)/lib/gcc/hppa64-linux-gnu/$(BASE_VERSION)/install-tools

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