* Fix a bunch of lintian warnings.

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8112 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

15 files changed, 128 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 1d4955a..b1552c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gcc-5 (5.1.1-10) UNRELEASED; urgency=medium
   * Fix mips 32bit (o32) multilib builds (YunQiang Su).
   * Build target libraries with -Wl,-z,relro.
   * Build libstdc++6 when building the common libraries.
+  * Fix a bunch of lintian warnings.
 
  -- Matthias Klose <doko@debian.org>  Wed, 10 Jun 2015 15:37:26 +0200
 
diff --git a/debian/control b/debian/control
index ea18faa..cfeda4f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb, 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat-4.9 [!m32r !sh3 !sh3eb !sh4 !sh4eb !m68k !powerpcspe !sparc64 !x32], netbase, 
+  procps, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat-4.9 [!m32r !sh3 !sh3eb !sh4 !sh4eb !m68k !powerpcspe !sparc64 !x32], g++-4.9, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k], realpath (>= 1.9.12), chrpath, lsb-release, quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
diff --git a/debian/control.m4 b/debian/control.m4
index 7526ab3..fa1e072 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -123,8 +123,8 @@ define(`BASEDEP', `gcc`'PV`'TS-base (= ${gcc:Version})')
 define(`SOFTBASEDEP', `gcc`'PV`'TS-base (>= ${gcc:SoftVersion})')
 
 ifdef(`TARGET',`
-define(`BASELDEP', `gcc`'PV`'TS-base (>= ${gcc:Version})')
-define(`SOFTBASELDEP', `gcc`'PV`'TS-base (>= ${gcc:SoftVersion})')
+define(`BASELDEP', `gcc`'PV-cross-base (= ${gcc:Version})')
+define(`SOFTBASELDEP', `gcc`'PV-cross-base (>= ${gcc:SoftVersion})')
 ',`dnl
 define(`BASELDEP', `BASEDEP')
 define(`SOFTBASELDEP', `SOFTBASEDEP')
@@ -162,6 +162,23 @@ ifdef(`BASE_ONLY', `dnl
 ')`'dnl
 ')`'dnl gccbase
 
+ifenabled(`gcclbase',`
+Package: gcc`'PV-cross-base
+Architecture: all
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',`PRI(required)')
+Depends: ${misc:Depends}
+BUILT_USING`'dnl
+Description: GCC, the GNU Compiler Collection (library base package)
+ This package contains files common to all libraries
+ contained in the GNU Compiler Collection (GCC).
+ifdef(`BASE_ONLY', `dnl
+ .
+ This version of GCC is not yet available for this architecture.
+ Please use the compilers from the gcc-snapshot package for testing.
+')`'dnl
+')`'dnl gcclbase
+
 ifenabled(`java',`
 ifdef(`TARGET', `', `
 ifenabled(`gcjbase',`
@@ -775,8 +792,8 @@ BUILT_USING`'dnl
 Description: GNU C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 
 ifenabled(`plugindev',`
@@ -881,8 +898,8 @@ BUILT_USING`'dnl
 Description: GNU C++ compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 ')`'dnl c++dev
 ')`'dnl c++
@@ -3254,8 +3271,8 @@ Description: GNU Objective-C++ compiler (multilib files)
  This is the GNU Objective-C++ compiler, which compiles Objective-C++ on
  platforms supported by the gcc compiler.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 ')`'dnl obcpp
 
@@ -3285,8 +3302,8 @@ Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET)',` (cross
  This is the GNU Objective-C compiler, which compiles Objective-C on platforms
  supported by the gcc compiler.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 
 Package: libobjc`'PV-dev`'LS
@@ -3563,8 +3580,8 @@ Description: GNU Fortran compiler (multilib files)`'ifdef(`TARGET)',` (cross com
  This is the GNU Fortran compiler, which compiles Fortran on platforms
  supported by the gcc compiler.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 
 ifenabled(`gfdldoc',`
@@ -3871,8 +3888,8 @@ Description: GNU Go compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler
  This is the GNU Go compiler, which compiles Go on platforms supported
  by the gcc compiler.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support,
+ holding dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 
 ifenabled(`gfdldoc',`
@@ -5055,8 +5072,8 @@ Description: GNU D compiler (version 2, multilib files)`'ifdef(`TARGET)',` (cros
  This is the GNU D compiler, which compiles D on platforms supported by gcc.
  It uses the gcc backend to generate optimised code.
  .
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This is a dependency package on architectures with multilib support, holding
+ dependencies for the non-default multilib architecture(s).
 ')`'dnl multilib
 
 ifenabled(`libphobos',`
diff --git a/debian/rules.conf b/debian/rules.conf
index 33f3bc8..c6368a8 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -673,6 +673,9 @@ control: control-file readme-bugs-file parameters-file symbols-files copyright-f
 ifneq (,$(filter $(DEB_STAGE),stage1 stage2))
   languages = c
   addons = gccbase cdev plugindev
+  ifeq ($(with_gcclbase),yes)
+    addons += gcclbase
+  endif
   ifeq ($(multilib),yes)
     addons += multilib
   endif
@@ -703,6 +706,9 @@ endif
 ifeq ($(with_gccbase),yes)
     addons += gccbase
 endif
+ifeq ($(with_gcclbase),yes)
+  addons += gcclbase
+endif
 ifneq ($(DEB_STAGE),rtlibs)
   addons += cdev c++dev source multilib
   ifneq (,$(filter fortran, $(languages)))
diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk
index fe1cad0..b20fc5b 100644
--- a/debian/rules.d/binary-base.mk
+++ b/debian/rules.d/binary-base.mk
@@ -1,4 +1,9 @@
 arch_binaries += base
+ifeq ($(with_gcclbase),yes)
+  ifneq ($(with_base_only),yes)
+    indep_binaries += lbase
+  endif
+endif
 
 # ---------------------------------------------------------------------------
 # gcc-base
@@ -53,3 +58,18 @@ endif
 	dh_md5sums -p$(p_base)
 	dh_builddeb -p$(p_base)
 	touch $@
+
+$(binary_stamp)-lbase: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	rm -rf $(d_lbase)
+	dh_installdocs -p$(p_lbase) debian/README.Debian
+	rm -f $(d_lbase)/usr/share/doc/$(p_lbase)/README.Debian
+	dh_installchangelogs -p$(p_lbase)
+	dh_compress -p$(p_lbase)
+	dh_fixperms -p$(p_lbase)
+	dh_gencontrol -p$(p_lbase) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lbase)
+	dh_md5sums -p$(p_lbase)
+	dh_builddeb -p$(p_lbase)
+	touch $@
diff --git a/debian/rules.d/binary-cpp.mk b/debian/rules.d/binary-cpp.mk
index d20b482..95ff473 100644
--- a/debian/rules.d/binary-cpp.mk
+++ b/debian/rules.d/binary-cpp.mk
@@ -46,6 +46,12 @@ ifneq ($(DEB_CROSS),yes)
   endif
 endif
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_cpp)/usr/share/lintian/overrides/$(p_cpp)
+	echo '$(p_cpp) binary: binary-without-manpage' \
+	  >> $(d_cpp)/usr/share/lintian/overrides/$(p_cpp)
+endif
+
 	debian/dh_doclink -p$(p_cpp) $(p_xbase)
 	debian/dh_rmemptydirs -p$(p_cpp)
 
diff --git a/debian/rules.d/binary-cxx.mk b/debian/rules.d/binary-cxx.mk
index 8a2136b..05a5405 100644
--- a/debian/rules.d/binary-cxx.mk
+++ b/debian/rules.d/binary-cxx.mk
@@ -53,6 +53,12 @@ ifneq ($(GFDL_INVARIANT_FREE),yes)
   endif
 endif
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_cxx)/usr/share/lintian/overrides/$(p_cxx)
+	echo '$(p_cxx) binary: binary-without-manpage' \
+	  >> $(d_cxx)/usr/share/lintian/overrides/$(p_cxx)
+endif
+
 	debian/dh_doclink -p$(p_cxx) $(p_xbase)
 	cp -p debian/README.C++ $(d_cxx)/$(docdir)/$(p_xbase)/C++/
 	cp -p $(srcdir)/gcc/cp/ChangeLog \
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index 456067b..9058514 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -201,6 +201,12 @@ ifneq ($(GFDL_INVARIANT_FREE),yes)
 endif
 endif
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_g95)/usr/share/lintian/overrides/$(p_g95)
+	echo '$(p_g95) binary: binary-without-manpage' \
+	  >> $(d_g95)/usr/share/lintian/overrides/$(p_g95)
+endif
+
 	debian/dh_doclink -p$(p_g95) $(p_xbase)
 
 	cp -p $(srcdir)/gcc/fortran/ChangeLog \
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index f09467d..631c023 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -169,6 +169,13 @@ endif
 	else \
 	  true; \
 	fi
+
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_gcc)/usr/share/lintian/overrides/$(p_gcc)
+	echo '$(p_gcc) binary: binary-without-manpage' \
+	  >> $(d_gcc)/usr/share/lintian/overrides/$(p_gcc)
+endif
+
 	debian/dh_rmemptydirs -p$(p_gcc)
 	dh_strip -p$(p_gcc) \
 	  $(if $(unstripped_exe),-X/lto1)
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index a8aabff..457ebbb 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -115,6 +115,10 @@ define __do_gccgo
 	debian/dh_doclink -p$(p_l) $(p_lbase)
 	debian/dh_doclink -p$(p_d) $(p_lbase)
 
+	mkdir -p $(d)/$(p_l)/usr/share/lintian/overrides
+	echo '$(p_l) binary: unstripped-binary-or-object' \
+	  >> $(d)/$(p_l)/usr/share/lintian/overrides/$(p_l)
+
 	: # don't strip: https://gcc.gnu.org/ml/gcc-patches/2015-02/msg01722.html
 	: # dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
@@ -267,6 +271,12 @@ ifeq ($(with_standalone_go),yes)
   endif
 endif
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_go)/usr/share/lintian/overrides/$(p_go)
+	echo '$(p_go) binary: binary-without-manpage' \
+	  >> $(d_go)/usr/share/lintian/overrides/$(p_go)
+endif
+
 	debian/dh_doclink -p$(p_go) $(p_xbase)
 
 #	cp -p $(srcdir)/gcc/go/ChangeLog \
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index 867b171..45948e7 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -289,6 +289,13 @@ ifneq ($(DEB_CROSS),yes)
 	    $(d_gcj)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gcj$(pkg_ver).1
   endif
 endif
+
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_gcj)/usr/share/lintian/overrides/$(p_gcj)
+	echo '$(p_gcj) binary: binary-without-manpage' \
+	  >> $(d_gcj)/usr/share/lintian/overrides/$(p_gcj)
+endif
+
 	debian/dh_doclink -p$(p_gcj) $(p_jbase)
 	debian/dh_rmemptydirs -p$(p_gcj)
 
diff --git a/debian/rules.d/binary-objc.mk b/debian/rules.d/binary-objc.mk
index 7b4d891..997369f 100644
--- a/debian/rules.d/binary-objc.mk
+++ b/debian/rules.d/binary-objc.mk
@@ -33,6 +33,12 @@ $(binary_stamp)-objc: $(install_stamp)
 	cp -p $(srcdir)/libobjc/ChangeLog \
 		$(d_objc)/$(docdir)/$(p_xbase)/ObjC/changelog.libobjc
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_objc)/usr/share/lintian/overrides/$(p_objc)
+	echo '$(p_objc) binary: binary-without-manpage' \
+	  >> $(d_objc)/usr/share/lintian/overrides/$(p_objc)
+endif
+
 	debian/dh_doclink -p$(p_objc) $(p_xbase)
 
 	debian/dh_rmemptydirs -p$(p_objc)
diff --git a/debian/rules.d/binary-objcxx.mk b/debian/rules.d/binary-objcxx.mk
index 1c3ad27..04accf4 100644
--- a/debian/rules.d/binary-objcxx.mk
+++ b/debian/rules.d/binary-objcxx.mk
@@ -31,6 +31,12 @@ $(binary_stamp)-objcxx: $(install_stamp)
 	cp -p $(srcdir)/gcc/objcp/ChangeLog \
 		$(d_objcx)/$(docdir)/$(p_xbase)/Obj-C++/changelog
 
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_objcx)/usr/share/lintian/overrides/$(p_objcx)
+	echo '$(p_objcx) binary: binary-without-manpage' \
+	  >> $(d_objcx)/usr/share/lintian/overrides/$(p_objcx)
+endif
+
 	debian/dh_rmemptydirs -p$(p_objcx)
 
 	dh_strip -p$(p_objcx) \
diff --git a/debian/rules.defs b/debian/rules.defs
index e294ec3..f4935c3 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -459,8 +459,13 @@ multilib_multiarch_map = \
 mlib_to_march = $(patsubst $(DEB_TARGET_ARCH)/$(1)=%,%, \
 		   $(filter $(DEB_TARGET_ARCH)/$(1)=%,$(multilib_multiarch_map)))
 
-# build a -base package.
+# build -base packages
 with_gccbase := yes
+ifeq ($(build_type),build-cross)
+  ifneq ($(DEB_STAGE),rtlibs)
+    with_gcclbase := yes
+  endif
+endif
 
 # build dev packages.
 ifneq ($(DEB_STAGE),rtlibs)
diff --git a/debian/rules2 b/debian/rules2
index 52282a5..fba611e 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -131,18 +131,19 @@ ifeq ($(with_ssp_default),yes)
     $(var) += $(cc-fno-stack-protector)))
 endif
 
-ifeq ($(DEB_CROSS),yes)
+# FIXME: passing LDFLAGS for native doesn't do anything
+ifneq (,$(filter $(build_type), build-cross cross-build-cross))
   CFLAGS	= -g -O2
+  LDFLAGS	= -Wl,-z,relro
+else
+  BOOT_LDFLAGS	= -Wl,-z,relro
 endif
+LDFLAGS_FOR_TARGET = -Wl,-z,relro
 
 ifneq (,$(findstring static,$(DEB_BUILD_OPTIONS)))
   LDFLAGS	+= -static
 endif
 
-# FIXME: passing LDFLAGS doesn't do anything
-BOOT_LDFLAGS = -Wl,-z,relro
-LDFLAGS_FOR_TARGET = -Wl,-z,relro
-
 # set CFLAGS/LDFLAGS for the configure step only, maybe be modifed for some target
 # all other flags are passed to the make step.
 CFLAGS_TO_PASS = \
@@ -1807,7 +1808,7 @@ ifneq ($(DEB_CROSS),yes)
 else
   # only triggered if DEB_CROSS set
   p_base = gcc$(pkg_ver)$(cross_bin_arch)-base
-  p_lbase = $(p_base)
+  p_lbase = gcc$(pkg_ver)-cross-base
   p_xbase = gcc$(pkg_ver)$(cross_bin_arch)-base
   p_cpp  = cpp$(pkg_ver)$(cross_bin_arch)
   p_gcc  = gcc$(pkg_ver)$(cross_bin_arch)