diff -Nru gcc-defaults-1.166ubuntu2/debian/changelog gcc-defaults-1.171ubuntu0.1/debian/changelog --- gcc-defaults-1.166ubuntu2/debian/changelog 2017-07-03 15:07:54.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/changelog 2017-07-06 15:32:29.000000000 +0000 @@ -1,45 +1,44 @@ -gcc-defaults (1.166ubuntu2) artful; urgency=medium +gcc-defaults (1.171ubuntu0.1) artful; urgency=medium - * Provide liblto_plugin.so symlink in /usr/lib/bfd-plugins. + * PPA upload. - -- Matthias Klose Mon, 03 Jul 2017 17:07:54 +0200 + -- Matthias Klose Thu, 06 Jul 2017 17:32:29 +0200 -gcc-defaults (1.166ubuntu1) zesty; urgency=medium +gcc-defaults (1.171) UNRELEASED; urgency=medium - * Merge with Debian; remaining changes: - - Build -multilib packages on armel and armhf (except for gccgo). - - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers. - - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. + * Provide liblto_plugin.so symlink in /usr/lib/bfd-plugins. Closes: #865690. + * dh_nativejava: Don't use deprecated POSIX::tmpnam(). Closes: #866315. + * Fix README.Bugs symlinks for cross compilers. Closes: #858112. - -- Matthias Klose Tue, 21 Mar 2017 12:04:28 +0100 + -- Matthias Klose Thu, 29 Jun 2017 10:14:08 +0200 -gcc-defaults (1.166) unstable; urgency=medium +gcc-defaults (1.170) experimental; urgency=medium - * gcc: Install gcov-dump symlinks. + * Bump GCC 6 version to 6.3.0. + * Bump GCC 7 version to 7.1.0. + * Build gccbrig and gcc-offload-nvptx packages. - -- Matthias Klose Thu, 16 Mar 2017 15:08:32 +0100 + -- Matthias Klose Tue, 21 Mar 2017 11:39:31 +0100 -gcc-defaults (1.165ubuntu3) zesty; urgency=medium +gcc-defaults (1.169) experimental; urgency=medium - * Merge with Debian; remaining changes: - - Build -multilib packages on armel and armhf (except for gccgo). - - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers. - - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. + * gcc-multilib: Add conflicts with GCC 7 cross compiler packages. + * Stop building powerpc cross packages from this source. + * Build mips64el packages from this source. - -- Matthias Klose Fri, 20 Jan 2017 11:13:25 +0100 + -- Matthias Klose Sun, 27 Nov 2016 16:37:59 +0100 -gcc-defaults (1.165) unstable; urgency=medium +gcc-defaults (1.168ubuntu2) zesty; urgency=medium - * Bump GCC 6 version to 6.3.0. - * Stop building powerpc cross packages from this source. - * Build mips64el packages from this source. - * gcc-multilib: Add conflicts with GCC 7 cross compiler packages. - * Mark all cross compiler packages excluding the -multilib packages - as M-A: foreign. - * Re-add mips64el as a gcj architecture. Closes: #851391. - * Bump libgcj-bc version number. Closes: #851775. + * Default to GCC 7, except for gij/gcj. + + -- Matthias Klose Sat, 26 Nov 2016 18:42:06 +0100 + +gcc-defaults (1.168) experimental; urgency=medium + + * Default to GCC 7, except for gij/gcj. - -- Matthias Klose Wed, 18 Jan 2017 17:11:46 +0100 + -- Matthias Klose Sat, 26 Nov 2016 17:14:56 +0100 gcc-defaults (1.164ubuntu1) zesty; urgency=medium diff -Nru gcc-defaults-1.166ubuntu2/debian/control gcc-defaults-1.171ubuntu0.1/debian/control --- gcc-defaults-1.166ubuntu2/debian/control 2017-03-21 11:09:43.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/control 2017-07-06 15:32:29.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: 3.9.8 Build-Depends: m4, debhelper (>= 9), dpkg-dev (>= 1.17.11), - gcc-6-base (>= 6.3.0-9), + gcc-7-base (>= 7.1.0-4), lsb-release Build-Depends-Indep: ca-certificates, gcj-jdk, python, gcj-6-jdk Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults @@ -368,6 +368,30 @@ Description: Phobos D standard library This is a dependency package providing the default D standard library. +Package: gccbrig +Priority: optional +Architecture: any +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:cpp}), + gccbrig-${pv:brig} ${reqv:brig}, ${misc:Depends} +Description: GNU BRIG (HSA IL) frontend + This is the GNU BRIG (HSA IL) frontend. The consumed format is a binary + representation. The textual HSAIL can be compiled to it with a separate + assembler. + . + This is a dependency package providing the default GNU Objective-C compiler. + +Package: gcc-offload-nvptx +Priority: optional +Architecture: amd64 +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:cpp}), + gcc-${pv:offl}-offload-nvptx ${reqv:offl}, ${misc:Depends} +Description: GCC offloading compiler to NVPTX + This package contains libgomp plugin for offloading to NVidia + PTX. The plugin needs libcuda.so.1 shared library that has to be + installed separately. + . + This is a dependency package providing the default GNU Objective-C compiler. + Package: gcc-hppa64-linux-gnu Priority: optional Architecture: amd64 hppa i386 x32 diff -Nru gcc-defaults-1.166ubuntu2/debian/control.native.in gcc-defaults-1.171ubuntu0.1/debian/control.native.in --- gcc-defaults-1.166ubuntu2/debian/control.native.in 2017-01-20 10:13:14.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/control.native.in 2017-07-06 15:31:15.000000000 +0000 @@ -353,3 +353,27 @@ Provides: libphobos-dev Description: Phobos D standard library This is a dependency package providing the default D standard library. + +Package: gccbrig +Priority: optional +Architecture: any +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:cpp}), + gccbrig-${pv:brig} ${reqv:brig}, ${misc:Depends} +Description: GNU BRIG (HSA IL) frontend + This is the GNU BRIG (HSA IL) frontend. The consumed format is a binary + representation. The textual HSAIL can be compiled to it with a separate + assembler. + . + This is a dependency package providing the default GNU Objective-C compiler. + +Package: gcc-offload-nvptx +Priority: optional +Architecture: amd64 +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:cpp}), + gcc-${pv:offl}-offload-nvptx ${reqv:offl}, ${misc:Depends} +Description: GCC offloading compiler to NVPTX + This package contains libgomp plugin for offloading to NVidia + PTX. The plugin needs libcuda.so.1 shared library that has to be + installed separately. + . + This is a dependency package providing the default GNU Objective-C compiler. diff -Nru gcc-defaults-1.166ubuntu2/debian/control.source gcc-defaults-1.171ubuntu0.1/debian/control.source --- gcc-defaults-1.166ubuntu2/debian/control.source 2017-03-21 11:05:03.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/control.source 2017-07-06 15:32:29.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: 3.9.8 Build-Depends: m4, debhelper (>= 9), dpkg-dev (>= 1.17.11), - gcc-6-base (>= 6.3.0-9), + gcc-7-base (>= 7.1.0-4), lsb-release Build-Depends-Indep: ca-certificates, gcj-jdk, python, gcj-6-jdk Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults diff -Nru gcc-defaults-1.166ubuntu2/debian/dh_nativejava gcc-defaults-1.171ubuntu0.1/debian/dh_nativejava --- gcc-defaults-1.166ubuntu2/debian/dh_nativejava 2011-04-11 07:54:37.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/dh_nativejava 2017-07-06 15:31:15.000000000 +0000 @@ -9,7 +9,7 @@ use strict; use Debian::Debhelper::Dh_Lib; use IO::File; -use POSIX qw(tmpnam); +use File::Temp qw(tempfile tempdir); use Cwd; =head1 SYNOPSIS @@ -62,10 +62,9 @@ } my $pwd = getcwd; -my $sourcelist; -do { - $sourcelist = tmpnam(); -} until my $fh = IO::File->new($sourcelist, O_RDWR|O_CREAT|O_EXCL); +my ($tdir, $fh, $sourcelist); +$tdir = tempdir(CLEANUP => 1); +($fh, $sourcelist) = tempfile("sourcesXXXXX", DIR => $tdir); foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); diff -Nru gcc-defaults-1.166ubuntu2/debian/README.Debian gcc-defaults-1.171ubuntu0.1/debian/README.Debian --- gcc-defaults-1.166ubuntu2/debian/README.Debian 2016-08-03 12:07:58.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/README.Debian 2016-11-26 17:53:47.000000000 +0000 @@ -50,16 +50,16 @@ The default compiler versions for Debian GNU/Linux on amd64 are (minor version numbers omitted): - cpp : cpp-6 - gcc : gcc-6 - g++ : g++-6 - gfortran : gfortran-6 + cpp : cpp-7 + gcc : gcc-7 + g++ : g++-7 + gfortran : gfortran-7 gcj : gcj-6 gij : gij-6 - gccgo : gccgo-6 - gobjc : gobjc-6 - gobjc++ : gobjc++-6 - gdc : gdc-6 + gccgo : gccgo-7 + gobjc : gobjc-7 + gobjc++ : gobjc++-7 + gdc : gdc-7 Documentation for the default compilers can be found in diff -Nru gcc-defaults-1.166ubuntu2/debian/rules gcc-defaults-1.171ubuntu0.1/debian/rules --- gcc-defaults-1.166ubuntu2/debian/rules 2017-07-03 15:07:54.000000000 +0000 +++ gcc-defaults-1.171ubuntu0.1/debian/rules 2017-07-06 15:32:29.000000000 +0000 @@ -152,6 +152,10 @@ REL_NO_62 := $(shell expr $(VMINOR) - 163)$(REL_EXT) REL_NO_63 := $(shell expr $(VMINOR) - 164)$(REL_EXT) +REL_NO_70 := $(shell expr $(VMINOR) - 167)$(REL_EXT) +REL_NO_71 := $(shell expr $(VMINOR) - 169)$(REL_EXT) +REL_NO_71 := $(shell expr $(VMINOR) - 170)$(REL_EXT) + # minimum required gcc-X.Y versions REQV_295 := (>= 1:2.95.4-16) REQV_296 := @@ -174,6 +178,7 @@ REQV_49 := (>= 4.9.3-10~) REQV_5 := (>= 5.4.1-2~) REQV_6 := (>= 6.3.0-9~) +REQV_7 := (>= 7.1.0-4~) REQV_LIBGCJ_BC := (>= 6.3.0-1~) @@ -188,104 +193,95 @@ all_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gcc5_archs = -gcc6_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 +gcc6_archs = +gcc7_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gcj5_archs = gcj6_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gnat5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gnat6_archs = +gnat6_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 +gnat7_archs = # CV_XXX is the complete version number, including the release, without epoch -CV_CPP := 6.3.0-$(REL_NO_63) -CV_GCC := 6.3.0-$(REL_NO_63) -CV_GPP := 6.3.0-$(REL_NO_63) -CV_GOBJC := 6.3.0-$(REL_NO_63) -CV_GOBJCXX := 6.3.0-$(REL_NO_63) -CV_GFORT := 6.3.0-$(REL_NO_63) -CV_GGO := 6.3.0-$(REL_NO_63) +CV_CPP := 7.1.0-$(REL_NO_71) +CV_GCC := 7.1.0-$(REL_NO_71) +CV_GPP := 7.1.0-$(REL_NO_71) +CV_GOBJC := 7.1.0-$(REL_NO_71) +CV_GOBJCXX := 7.1.0-$(REL_NO_71) +CV_GFORT := 7.1.0-$(REL_NO_71) +CV_GGO := 7.1.0-$(REL_NO_71) CV_GNAT := 6.3.0-$(REL_NO_63) CV_GCJ := 6.3.0-$(REL_NO_63) CV_GIJ := 6.3.0-$(REL_NO_63) CV_LIBGCJBC := 6.3.0-$(REL_NO_63) -CV_GDC := 6.3.0-$(REL_NO_63) +CV_GDC := 7.1.0-$(REL_NO_71) CV_LIBGCJCOMMON := 1:6.3-$(REL_NO_63) +CV_BRIG := 7.1.0-$(REL_NO_71) +CV_OFFL := 7.1.0-$(REL_NO_71) + $(foreach a, $(all_archs), \ - $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GNAT CV_GCJ CV_GDC, \ + $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GNAT CV_GCJ CV_GDC CV_BRIG CV_OFFL, \ $(eval $(v)_$(a) = $(call $(v))))) -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc5_archs))) - CV_CPP := 5.4-$(REL_NO_54) - CV_GCC := 5.4-$(REL_NO_54) - CV_GPP := 5.4-$(REL_NO_54) - CV_GOBJC := 5.4-$(REL_NO_54) - CV_GOBJCXX := 5.4-$(REL_NO_54) - CV_GFORT := 5.4-$(REL_NO_54) - CV_GGO := 5.4-$(REL_NO_54) - CV_GDC := 5.4-$(REL_NO_54) - $(foreach a, $(gcc5_archs), \ - $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GDC, \ - $(eval $(v)_$(a) = $(call $(v))))) -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj5_archs))) - CV_GCJ := 5.4-$(REL_NO_54) - CV_GIJ := 5.4-$(REL_NO_54) - CV_LIBGCJBC := 5.4-$(REL_NO_54) - $(foreach a, $(gcc5_archs), \ - $(foreach v, CV_GCJ, \ +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc6_archs))) + CV_CPP := 6.3.0-$(REL_NO_63) + CV_GCC := 6.3.0-$(REL_NO_63) + CV_GPP := 6.3.0-$(REL_NO_63) + CV_GOBJC := 6.3.0-$(REL_NO_63) + CV_GOBJCXX := 6.3.0-$(REL_NO_63) + CV_GFORT := 6.3.0-$(REL_NO_63) + CV_GGO := 6.3.0-$(REL_NO_63) + CV_GDC := 6.3.0-$(REL_NO_63) + CV_BRIG := 6.3.0-$(REL_NO_63) + CV_OFFL := 6.3.0-$(REL_NO_63) + $(foreach a, $(gcc6_archs), \ + $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GDC CV_BRIG CV_OFFL, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH), $(gnat5_archs))) - CV_GNAT := 5.4-$(REL_NO_54) +ifneq (,$(filter $(DEB_HOST_ARCH), $(gnat6_archs))) + CV_GNAT := 6.3.0-$(REL_NO_63) $(foreach a, $(gnat5_archs), \ $(foreach v, CV_GNAT, \ $(eval $(v)_$(a) = $(call $(v))))) endif -REQV_CPP = $(REQV_6) -REQV_GCC = $(REQV_6) -REQV_GPP = $(REQV_6) -REQV_GOBJC = $(REQV_6) -REQV_GOBJCXX = $(REQV_6) -REQV_GFORT = $(REQV_6) -REQV_GGO = $(REQV_6) +REQV_CPP = $(REQV_7) +REQV_GCC = $(REQV_7) +REQV_GPP = $(REQV_7) +REQV_GOBJC = $(REQV_7) +REQV_GOBJCXX = $(REQV_7) +REQV_GFORT = $(REQV_7) +REQV_GGO = $(REQV_7) REQV_GNAT = $(REQV_6) REQV_GCJ = $(REQV_6) REQV_GIJ = $(REQV_6) -REQV_GDC = $(REQV_6) +REQV_GDC = $(REQV_7) +REQV_BRIG = $(REQV_7) +REQV_OFFL = $(REQV_7) $(foreach a, $(all_archs), \ - $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GNAT REQV_GCJ REQV_GDC, \ + $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GNAT REQV_GCJ REQV_GDC REQV_BRIG REQV_OFFL, \ $(eval $(v)_$(a) = $(call $(v))))) -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc5_archs))) - REQV_CPP = $(REQV_5) - REQV_GCC = $(REQV_5) - REQV_GPP = $(REQV_5) - REQV_GOBJC = $(REQV_5) - REQV_GOBJCXX = $(REQV_5) - REQV_GFORT = $(REQV_5) - REQV_GGO = $(REQV_5) - REQV_GNAT = $(REQV_5) - REQV_GDC = $(REQV_5) - $(foreach a, $(gcc5_archs), \ - $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GCJ REQV_GDC, \ +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc6_archs))) + REQV_CPP = $(REQV_6) + REQV_GCC = $(REQV_6) + REQV_GPP = $(REQV_6) + REQV_GOBJC = $(REQV_6) + REQV_GOBJCXX = $(REQV_6) + REQV_GFORT = $(REQV_6) + REQV_GGO = $(REQV_6) + REQV_GNAT = $(REQV_6) + REQV_GDC = $(REQV_6) + REQV_BRIG = $(REQV_6) + REQV_OFFL = $(REQV_6) + $(foreach a, $(gcc6_archs), \ + $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GCJ REQV_GDC REQV_BRIG REQV_OFFL, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj5_archs))) - REQV_GCJ = $(REQV_5) - REQV_GIJ = $(REQV_5) - $(foreach a, $(gcj5_archs), \ - $(foreach v, REQV_GCJ, \ - $(eval $(v)_$(a) = $(call $(v))))) -endif - -ifneq (,$(filter $(DEB_HOST_ARCH),$(gnat5_archs))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(gnat6_archs))) REQV_GNAT = $(REQV_5) - $(foreach a, $(gnat5_archs), \ + $(foreach a, $(gnat6_archs), \ $(foreach v, REQV_GNAT, \ $(eval $(v)_$(a) = $(call $(v))))) endif @@ -323,6 +319,8 @@ powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64 \ kfreebsd-amd64 kfreebsd-i386 hurd-i386 +nvptx_archs = amd64 + hppa64_archs = amd64 hppa i386 x32 phobos_archs = amd64 armel armhf i386 x32 hppa @@ -373,10 +371,13 @@ all_packages := ifeq ($(with_native),yes) # FIXME: not all packages ... - all_packages := cpp gcc g++ gfortran gcj-jdk gobjc gobjc++ gdc gccgo libgphobos-dev + all_packages := cpp gcc g++ gfortran gcj-jdk gobjc gobjc++ gdc gccgo libgphobos-dev gccbrig ifneq (,$(filter $(DEB_HOST_ARCH), $(hppa64_archs))) all_packages += gcc-hppa64-linux-gnu endif + ifneq (,$(filter $(DEB_HOST_ARCH), $(nvptx_archs))) + all_packages += gcc-offload-nvptx + endif endif no_packages := @@ -471,29 +472,29 @@ packages := $(filter-out $(no_packages), $(all_packages)) # derived version number (without release, e.g. 4.9.3, 5.2.1) -$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ +$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \ $(eval $(v) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)))),%,$(call C$(v)))) \ ) $(foreach a, $(all_archs), \ - $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \ $(eval $(v)_$(a) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)_$(a)))),%,$(call C$(v)_$(a)))) \ )) # number for the package name (e.g. 4.9, 5, 6) -$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ +$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \ $(eval P$(v) = $(firstword $(subst -, ,$(subst ., ,$(call $(v)))))) \ ) $(foreach a, $(all_archs), \ - $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \ $(eval P$(v)_$(a) = $(firstword $(subst -, ,$(subst ., ,$(call $(v)_$(a)))))) \ )) ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs))) - $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC, \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_BRIG V_OFFL, \ $(eval P$(v) = $(subst $(SPACE),.,$(wordlist 1,2,$(subst ., ,$(call $(v)))))) \ ) $(foreach a, $(gcc49_archs), \ - $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC, \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_BRIG V_OFFL, \ $(eval P$(v)_$(a) = $(subst $(SPACE),.,$(wordlist 1,2,$(subst ., ,$(call $(v)_$(a)))))) \ )) endif @@ -537,6 +538,8 @@ -DV_GCJ=$(V_GCJ) -DPV_GCJ=$(PV_GCJ) \ -DV_GIJ=$(V_GIJ) -DPV_GIJ=$(PV_GIJ) \ -DV_GDC=$(V_GDC) -DPV_GDC=$(PV_GDC) \ + -DV_BRIG=$(V_BRIG) -DPV_BRIG=$(PV_BRIG) \ + -DV_OFFL=$(V_OFFL) -DPV_OFFL=$(PV_OFFL) \ $(if $(filter yes,$(with_gfdl_docs)), -DGFDL) \ debian/README.Debian.m4 > debian/README.Debian.tmp2 uniq debian/README.Debian.tmp2 > debian/README.Debian.tmp @@ -561,6 +564,8 @@ echo 'version:gnat=$(EPOCH):$(CV_GNAT)'; \ echo 'version:gdc=$(CV_GDC)'; \ echo 'version:libgcjcommon=$(CV_LIBGCJCOMMON)'; \ + echo 'version:brig=$(CV_BRIG)'; \ + echo 'version:offl=$(CV_OFFL)'; \ echo 'pv:cpp=$(PV_CPP)'; \ echo 'pv:gcc=$(PV_GCC)'; \ echo 'pv:gpp=$(PV_GPP)'; \ @@ -572,6 +577,8 @@ echo 'pv:gcj=$(PV_GCJ)'; \ echo 'pv:gij=$(PV_GIJ)'; \ echo 'pv:gdc=$(PV_GDC)'; \ + echo 'pv:brig=$(PV_BRIG)'; \ + echo 'pv:offl=$(PV_OFFL)'; \ echo 'reqv:cpp=$(REQV_CPP)'; \ echo 'reqv:gcc=$(REQV_GCC)'; \ echo 'reqv:gpp=$(REQV_GPP)'; \ @@ -583,6 +590,8 @@ echo 'reqv:gcj=$(REQV_GCJ)'; \ echo 'reqv:gij=$(REQV_GIJ)'; \ echo 'reqv:gdc=$(REQV_GDC)'; \ + echo 'reqv:brig=$(REQV_BRIG)'; \ + echo 'reqv:offl=$(REQV_OFFL)'; \ echo 'pkg:libgcj=$(LIBGCJ)'; \ echo 'pkg:libgcjawt=$(LIBGCJ)-awt'; \ echo 'version:libgcjbc=$(CV_LIBGCJBC)'; \ @@ -808,6 +817,8 @@ $(if $(filter $(DEB_HOST_ARCH), $(gcc49_archs)),, \ /usr/share/man/man1/gcov-tool-$(PV_GCC).1.gz /usr/share/man/man1/gcov-tool.1.gz \ /usr/share/man/man1/gcov-tool-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcov-tool.1.gz \ + /usr/share/man/man1/gcov-dump-$(PV_GCC).1.gz /usr/share/man/man1/gcov-dump.1.gz \ + /usr/share/man/man1/gcov-dump-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcov-dump.1.gz \ ) : # gcc-doc dh_installdirs -pgcc-doc \ @@ -1082,6 +1093,32 @@ mkdir -p debian/libgcj-common/usr/share/man/man1 install -m644 debian/dh_nativejava.1 debian/libgcj-common/usr/share/man/man1/ +ifneq (,$(filter gccbrig, $(packages))) + : # gccbrig + dh_installdirs -pgccbrig + dh_link -pgccbrig \ + /usr/share/doc/cpp /usr/share/doc/gccbrig \ + /usr/bin/gccbrig-$(PV_BRIG) /usr/bin/gccbrig \ + /usr/bin/gccbrig-$(PV_BRIG) /usr/bin/$(DEB_HOST_GNU_TYPE)-gccbrig \ + $(if $(filter yes, $(with_gfdl_docs)), \ + /usr/share/man/man1/gccbrig-$(PV_BRIG).1.gz /usr/share/man/man1/gccbrig.1.gz \ + /usr/share/man/man1/gccbrig-$(PV_BRIG).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gccbrig.1.gz \ + ) +endif + +ifneq (,$(filter gcc-offload-nvptx, $(packages))) + : # gcc-offload-nvptx + dh_installdirs -pgcc-offload-nvptx + dh_link -pgcc-offload-nvptx \ + /usr/share/doc/cpp /usr/share/doc/gcc-offload-nvptx \ + /usr/bin/$(DEB_HOST_GNU_TYPE)-accel-nvptx-none-gcc-$(PV_OFFL) \ + /usr/bin/$(DEB_HOST_GNU_TYPE)-accel-nvptx-none-gcc \ + $(if $(filter yes, $(with_gfdl_docs)), \ + /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-accel-nvptx-none-$(PV_OFFL).1.gz \ + /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-accel-nvptx-none.1.gz \ + ) +endif + ifneq (,$(filter gcc-hppa64-linux-gnu, $(packages))) : # gcc-hppa64-linux-gnu dh_installdirs -pgcc-hppa64-linux-gnu @@ -1130,7 +1167,7 @@ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gcc-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gcc-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcc \ /usr/bin/$(CROSS_GNU_TYPE)-gcov-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcov \ - /usr/share/doc/gcc-$(PV_GCC_$(CROSS_ARCH))-base/README.Bugs /usr/share/doc/cpp-$(CROSS_GNU_TYPE)/README.Bugs \ + /usr/share/doc/gcc-$(PV_GCC)-$(CROSS_GNU_TYPE)-base/README.Bugs /usr/share/doc/cpp-$(CROSS_GNU_TYPE)/README.Bugs \ $(if $(filter $(CROSS_ARCH), $(gcc49_archs)),, \ /usr/bin/$(CROSS_GNU_TYPE)-gcov-dump-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcov-dump \ /usr/bin/$(CROSS_GNU_TYPE)-gcov-tool-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcov-tool \ @@ -1157,7 +1194,9 @@ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-$(PV_GCC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov.1.gz \ $(if $(filter $(CROSS_ARCH), $(gcc49_archs)),, \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-tool-$(PV_GCC_$(CROSS_ARCH)).1.gz \ - /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-tool.1.gz) \ + /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-tool.1.gz \ + /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-dump-$(PV_GCC_$(CROSS_ARCH)).1.gz \ + /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-dump.1.gz) \ ) : # gdc-$(CROSS_GNU_TYPE) @@ -1415,6 +1454,14 @@ dh_gencontrol -pgcj-jre-headless -pgcj-jre -pgcj-jdk \ -u-v$(EPOCH):$(CV_GCJ) endif +ifneq (,$(filter gccbrig, $(packages))) + dh_gencontrol -pgccbrig \ + -u-v$(EPOCH):$(CV_BRIG) +endif +ifneq (,$(filter gcc-offload-nvptx, $(packages))) + dh_gencontrol -pgcc-offload-nvptx \ + -u-v$(EPOCH):$(CV_OFFL) +endif ifneq (,$(filter gcc-hppa64-linux-gnu, $(packages))) dh_gencontrol -pgcc-hppa64-linux-gnu \ -u-v$(EPOCH):$(CV_GCC)