diff -Nru gcc-defaults-1.175ubuntu1/debian/changelog gcc-defaults-1.176ubuntu2/debian/changelog --- gcc-defaults-1.175ubuntu1/debian/changelog 2018-03-23 23:15:28.000000000 +0000 +++ gcc-defaults-1.176ubuntu2/debian/changelog 2018-04-06 18:04:15.000000000 +0000 @@ -1,3 +1,18 @@ +gcc-defaults (1.176ubuntu2) bionic; 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. + + -- Matthias Klose Fri, 06 Apr 2018 20:04:15 +0200 + +gcc-defaults (1.176) unstable; urgency=medium + + * Build defaults packages for amd64 and i386. + + -- Matthias Klose Wed, 04 Apr 2018 12:16:13 +0200 + gcc-defaults (1.175ubuntu1) bionic; urgency=medium * Merge with Debian; remaining changes: diff -Nru gcc-defaults-1.175ubuntu1/debian/control gcc-defaults-1.176ubuntu2/debian/control --- gcc-defaults-1.175ubuntu1/debian/control 2018-03-23 23:15:28.000000000 +0000 +++ gcc-defaults-1.176ubuntu2/debian/control 2018-04-06 18:04:15.000000000 +0000 @@ -107,6 +107,7 @@ gcc-7-arm-linux-gnueabi, gcc-7-arm-linux-gnueabihf, gcc-7-hppa-linux-gnu, + gcc-7-i686-linux-gnu, gcc-7-m68k-linux-gnu, gcc-7-powerpc-linux-gnu, gcc-7-powerpc-linux-gnuspe, @@ -116,15 +117,18 @@ gcc-7-mipsel-linux-gnu, gcc-7-mips64-linux-gnuabi64, gcc-7-mips64el-linux-gnuabi64, + gcc-7-riscv64-linux-gnu, gcc-7-s390x-linux-gnu, gcc-7-sh4-linux-gnu, gcc-7-sparc-linux-gnu, - gcc-7-sparc64-linux-gnu, + gcc-7-x86-64-linux-gnu, + gcc-7-x86-64-linux-gnux32, gcc-8-aarch64-linux-gnu, gcc-8-alpha-linux-gnu, gcc-8-arm-linux-gnueabi, gcc-8-arm-linux-gnueabihf, gcc-8-hppa-linux-gnu, + gcc-8-i686-linux-gnu, gcc-8-m68k-linux-gnu, gcc-8-powerpc-linux-gnu, gcc-8-powerpc-linux-gnuspe, @@ -134,15 +138,19 @@ gcc-8-mipsel-linux-gnu, gcc-8-mips64-linux-gnuabi64, gcc-8-mips64el-linux-gnuabi64, + gcc-8-riscv64-linux-gnu, gcc-8-s390x-linux-gnu, gcc-8-sh4-linux-gnu, gcc-8-sparc-linux-gnu, gcc-8-sparc64-linux-gnu, + gcc-8-x86-64-linux-gnu, + gcc-8-x86-64-linux-gnux32, gcc-9-aarch64-linux-gnu, gcc-9-alpha-linux-gnu, gcc-9-arm-linux-gnueabi, gcc-9-arm-linux-gnueabihf, gcc-9-hppa-linux-gnu, + gcc-9-i686-linux-gnu, gcc-9-m68k-linux-gnu, gcc-9-powerpc-linux-gnu, gcc-9-powerpc-linux-gnuspe, @@ -152,10 +160,13 @@ gcc-9-mipsel-linux-gnu, gcc-9-mips64-linux-gnuabi64, gcc-9-mips64el-linux-gnuabi64, + gcc-9-riscv64-linux-gnu, gcc-9-s390x-linux-gnu, gcc-9-sh4-linux-gnu, gcc-9-sparc-linux-gnu, gcc-9-sparc64-linux-gnu, + gcc-9-x86-64-linux-gnu, + gcc-9-x86-64-linux-gnux32, Description: GNU C compiler (multilib files) This is the GNU C compiler, a fairly portable optimizing compiler for C. . @@ -426,6 +437,271 @@ This is a dependency package providing the default GNU C cross-compiler for the hppa64 architecture. +Package: cpp-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Section: interpreters +Depends: cpp-${pv:cpp}-x86-64-linux-gnu ${reqv:cpp}, ${misc:Depends} +Suggests: cpp-doc +Description: GNU C preprocessor (cpp) for the amd64 architecture + The GNU C preprocessor is a macro processor that is used automatically + by the GNU C compiler to transform programs before actual compilation. + . + This package has been separated from gcc for the benefit of those who + require the preprocessor but not the cross-compiler for amd64 architecture. + . + This is a dependency package providing the default GNU C preprocessor + for the amd64 architecture. + +Package: gcc-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-${pv:gcc}-x86-64-linux-gnu ${reqv:gcc}, + ${misc:Depends} +Recommends: libc6-dev-amd64-cross | libc-dev-amd64-cross +Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-x86-64-linux-gnu, gcc-doc +Description: GNU C compiler for the amd64 architecture + This is the GNU C compiler, a fairly portable optimizing compiler for C. + . + This is a dependency package providing the default GNU C cross-compiler + for the amd64 architecture. + +Package: g++-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-x86-64-linux-gnu (>= ${version:cpp}), + g++-${pv:gpp}-x86-64-linux-gnu ${reqv:gpp}, + ${misc:Depends} +Description: GNU C++ compiler for the amd64 architecture + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + . + This is a dependency package providing the default GNU C++ cross-compiler + for the amd64 architecture. + +Package: gobjc-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-x86-64-linux-gnu (>= ${version:cpp}), + gobjc-${pv:gobjc}-x86-64-linux-gnu ${reqv:gobjc}, + ${misc:Depends} +Description: GNU Objective-C compiler for the amd64 architecture + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Objective-C + cross-compiler for the amd64 architecture. + +Package: gobjc++-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-x86-64-linux-gnu (>= ${version:cpp}), + gobjc++-${pv:gobjcxx}-x86-64-linux-gnu ${reqv:gobjcxx}, + ${misc:Depends} +Recommends: g++-x86-64-linux-gnu (>= ${version:cpp}), gobjc-x86-64-linux-gnu (>= ${version:cpp}) +Description: GNU Objective-C++ compiler for the amd64 architecture + This is the GNU Objective-C++ compiler, which compiles + Objective-C++ on platforms supported by the gcc compiler. It uses the + gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Objective-C++ + cross-compiler for the amd64 architecture. + +Package: gfortran-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-x86-64-linux-gnu (>= ${version:gcc}), + gfortran-${pv:gfort}-x86-64-linux-gnu ${reqv:gfort}, + ${misc:Depends} +Suggests: gfortran-doc +Description: GNU Fortran 95 compiler for the amd64 architecture + This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Fortran 95 + cross-compiler for the amd64 architecture. + +Package: gccgo-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + g++-x86-64-linux-gnu (>= ${version:gcc}), + gccgo-${pv:ggo}-x86-64-linux-gnu ${reqv:ggo}, + ${misc:Depends} +Suggests: gccgo-doc +Description: Go compiler (based on GCC) for the amd64 architecture + This is the GNU Go compiler, which compiles Go on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Go cross-compiler + for the amd64 architecture. + +#Package: gcj-x86-64-linux-gnu +#Priority: optional +#Architecture: arm64 i386 ppc64el x32 +#Multi-Arch: foreign +#Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), +# gcj-${pv:gcj}-x86-64-linux-gnu ${reqv:gcj}, +# ${misc:Depends} +#Description: GNU Java compiler (based on GCC) for the amd64 architecture +# This is the GNU Java compiler, which compiles java on platforms supported by +# the gcc compiler. It uses the gcc backend to generate optimized code. +# . +# This is a dependency package providing the default GNU Java cross-compiler +# for the amd64 architecture. + +Package: gdc-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gdc-${pv:gdc}-x86-64-linux-gnu ${reqv:gdc}, + ${misc:Depends} +Description: GNU D compiler (based on GCC) for the amd64 architecture + This is the GNU D compiler, which compiles D on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU D cross-compiler + for the amd64 architecture. + +Package: gcc-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-x86-64-linux-gnu (>= ${version:gcc}), + gcc-${pv:gcc}-multilib-x86-64-linux-gnu ${reqv:gcc}, + ${misc:Depends} +Recommends: libc6-dev-amd64-cross | libc-dev-amd64-cross +Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-x86-64-linux-gnu, gcc-doc +Description: GNU C compiler for the amd64 architecture + This is the GNU C compiler, a fairly portable optimizing compiler for C. + . + This is a dependency package providing the default GNU C cross-compiler + for the amd64 architecture. + +Package: g++-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + g++-x86-64-linux-gnu (>= ${version:gpp}), + gcc-multilib-x86-64-linux-gnu (>= ${version:gcc}), + g++-${pv:gpp}-multilib-x86-64-linux-gnu ${reqv:gpp}, + ${misc:Depends} +Description: GNU C++ compiler for the amd64 architecture + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + . + This is a dependency package providing the default GNU C++ + cross-compiler for the amd64 architecture. + +Package: gobjc-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gobjc-x86-64-linux-gnu (>= ${version:gobjc}), + gcc-multilib-x86-64-linux-gnu (>= ${version:cpp}), + gobjc-${pv:gobjc}-multilib-x86-64-linux-gnu ${reqv:gobjc}, + ${misc:Depends} +Description: GNU Objective-C compiler for the amd64 architecture + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Objective-C + cross-compiler for the amd64 architecture. + +Package: gobjc++-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-multilib-x86-64-linux-gnu (>= ${version:cpp}), + gobjc++-x86-64-linux-gnu (>= ${version:gobjcxx}), + gobjc++-${pv:gobjcxx}-multilib-x86-64-linux-gnu ${reqv:gobjcxx}, + ${misc:Depends} +Recommends: g++-x86-64-linux-gnu (>= ${version:cpp}), + gobjc-x86-64-linux-gnu (>= ${version:cpp}) +Description: GNU Objective-C++ compiler for the amd64 architecture + This is the GNU Objective-C++ compiler, which compiles + Objective-C++ on platforms supported by the gcc compiler. It uses the + gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Objective-C++ + cross-compiler for the amd64 architecture. + +Package: gfortran-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gcc-multilib-x86-64-linux-gnu (>= ${version:gcc}), + gfortran-x86-64-linux-gnu (>= ${version:gfort}), + gfortran-${pv:gfort}-multilib-x86-64-linux-gnu ${reqv:gfort}, + ${misc:Depends} +Suggests: gfortran-doc +Description: GNU Fortran 95 compiler for the amd64 architecture + This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Fortran 95 + cross-compiler for the amd64 architecture. + +Package: gccgo-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + g++-multilib-x86-64-linux-gnu (>= ${version:gcc}), + gccgo-x86-64-linux-gnu (>= ${version:ggo}), + gccgo-${pv:ggo}-multilib-x86-64-linux-gnu ${reqv:ggo}, + ${misc:Depends} +Suggests: gccgo-doc +Description: Go compiler (based on GCC) for the amd64 architecture + This is the GNU Go compiler, which compiles Go on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Go cross-compiler + cross-compiler for the amd64 architecture. + +Package: gdc-multilib-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}), + gdc-${pv:gdc}-multilib-x86-64-linux-gnu ${reqv:gdc}, + gdc-x86-64-linux-gnu (>= ${version:gdc}), + ${misc:Depends} +Description: GNU D compiler (based on GCC) for the amd64 architecture + This is the GNU D compiler, which compiles D on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU D cross-compiler + cross-compiler for the amd64 architecture. + +Package: pkg-config-x86-64-linux-gnu +Priority: optional +Architecture: arm64 i386 ppc64el x32 +Depends: pkg-config (>= 0.25-1.1ubuntu2), ${misc:Depends} +Description: manage compile and link flags for libraries for amd64 architecture + pkg-config is a system for managing library compile and link flags that + works with automake and autoconf. + . + Increasingly libraries ship with ".pc" files that allow querying of the + compiler and linker flags needed to use them through the pkg-config(1) + program. + . + This is a dependency package providing cross pkg-config support for the + amd64 architecture. + Package: cpp-s390x-linux-gnu Priority: optional Architecture: amd64 i386 x32 @@ -1796,6 +2072,271 @@ This is a dependency package providing cross pkg-config support for the powerpc architecture. +Package: cpp-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Section: interpreters +Depends: cpp-${pv:cpp}-i686-linux-gnu ${reqv:cpp}, ${misc:Depends} +Suggests: cpp-doc +Description: GNU C preprocessor (cpp) for the i386 architecture + The GNU C preprocessor is a macro processor that is used automatically + by the GNU C compiler to transform programs before actual compilation. + . + This package has been separated from gcc for the benefit of those who + require the preprocessor but not the cross-compiler for i386 architecture. + . + This is a dependency package providing the default GNU C preprocessor + for the i386 architecture. + +Package: gcc-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-${pv:gcc}-i686-linux-gnu ${reqv:gcc}, + ${misc:Depends} +Recommends: libc6-dev-i386-cross | libc-dev-i386-cross +Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-i686-linux-gnu, gcc-doc +Description: GNU C compiler for the i386 architecture + This is the GNU C compiler, a fairly portable optimizing compiler for C. + . + This is a dependency package providing the default GNU C cross-compiler + for the i386 architecture. + +Package: g++-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-i686-linux-gnu (>= ${version:cpp}), + g++-${pv:gpp}-i686-linux-gnu ${reqv:gpp}, + ${misc:Depends} +Description: GNU C++ compiler for the i386 architecture + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + . + This is a dependency package providing the default GNU C++ cross-compiler + for the i386 architecture. + +Package: gobjc-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-i686-linux-gnu (>= ${version:cpp}), + gobjc-${pv:gobjc}-i686-linux-gnu ${reqv:gobjc}, + ${misc:Depends} +Description: GNU Objective-C compiler for the i386 architecture + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Objective-C + cross-compiler for the i386 architecture. + +Package: gobjc++-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-i686-linux-gnu (>= ${version:cpp}), + gobjc++-${pv:gobjcxx}-i686-linux-gnu ${reqv:gobjcxx}, + ${misc:Depends} +Recommends: g++-i686-linux-gnu (>= ${version:cpp}), gobjc-i686-linux-gnu (>= ${version:cpp}) +Description: GNU Objective-C++ compiler for the i386 architecture + This is the GNU Objective-C++ compiler, which compiles + Objective-C++ on platforms supported by the gcc compiler. It uses the + gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Objective-C++ + cross-compiler for the i386 architecture. + +Package: gfortran-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-i686-linux-gnu (>= ${version:gcc}), + gfortran-${pv:gfort}-i686-linux-gnu ${reqv:gfort}, + ${misc:Depends} +Suggests: gfortran-doc +Description: GNU Fortran 95 compiler for the i386 architecture + This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Fortran 95 + cross-compiler for the i386 architecture. + +Package: gccgo-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + g++-i686-linux-gnu (>= ${version:gcc}), + gccgo-${pv:ggo}-i686-linux-gnu ${reqv:ggo}, + ${misc:Depends} +Suggests: gccgo-doc +Description: Go compiler (based on GCC) for the i386 architecture + This is the GNU Go compiler, which compiles Go on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Go cross-compiler + for the i386 architecture. + +#Package: gcj-i686-linux-gnu +#Priority: optional +#Architecture: amd64 arm64 ppc64el x32 +#Multi-Arch: foreign +#Depends: cpp-i686-linux-gnu (>= ${version:cpp}), +# gcj-${pv:gcj}-i686-linux-gnu ${reqv:gcj}, +# ${misc:Depends} +#Description: GNU Java compiler (based on GCC) for the i386 architecture +# This is the GNU Java compiler, which compiles java on platforms supported by +# the gcc compiler. It uses the gcc backend to generate optimized code. +# . +# This is a dependency package providing the default GNU Java cross-compiler +# for the i386 architecture. + +Package: gdc-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Multi-Arch: foreign +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gdc-${pv:gdc}-i686-linux-gnu ${reqv:gdc}, + ${misc:Depends} +Description: GNU D compiler (based on GCC) for the i386 architecture + This is the GNU D compiler, which compiles D on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU D cross-compiler + for the i386 architecture. + +Package: gcc-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-i686-linux-gnu (>= ${version:gcc}), + gcc-${pv:gcc}-multilib-i686-linux-gnu ${reqv:gcc}, + ${misc:Depends} +Recommends: libc6-dev-i386-cross | libc-dev-i386-cross +Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-i686-linux-gnu, gcc-doc +Description: GNU C compiler for the i386 architecture + This is the GNU C compiler, a fairly portable optimizing compiler for C. + . + This is a dependency package providing the default GNU C cross-compiler + for the i386 architecture. + +Package: g++-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + g++-i686-linux-gnu (>= ${version:gpp}), + gcc-multilib-i686-linux-gnu (>= ${version:gcc}), + g++-${pv:gpp}-multilib-i686-linux-gnu ${reqv:gpp}, + ${misc:Depends} +Description: GNU C++ compiler for the i386 architecture + This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. + . + This is a dependency package providing the default GNU C++ + cross-compiler for the i386 architecture. + +Package: gobjc-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gobjc-i686-linux-gnu (>= ${version:gobjc}), + gcc-multilib-i686-linux-gnu (>= ${version:cpp}), + gobjc-${pv:gobjc}-multilib-i686-linux-gnu ${reqv:gobjc}, + ${misc:Depends} +Description: GNU Objective-C compiler for the i386 architecture + This is the GNU Objective-C compiler, which compiles Objective-C on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Objective-C + cross-compiler for the i386 architecture. + +Package: gobjc++-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-multilib-i686-linux-gnu (>= ${version:cpp}), + gobjc++-i686-linux-gnu (>= ${version:gobjcxx}), + gobjc++-${pv:gobjcxx}-multilib-i686-linux-gnu ${reqv:gobjcxx}, + ${misc:Depends} +Recommends: g++-i686-linux-gnu (>= ${version:cpp}), + gobjc-i686-linux-gnu (>= ${version:cpp}) +Description: GNU Objective-C++ compiler for the i386 architecture + This is the GNU Objective-C++ compiler, which compiles + Objective-C++ on platforms supported by the gcc compiler. It uses the + gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Objective-C++ + cross-compiler for the i386 architecture. + +Package: gfortran-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gcc-multilib-i686-linux-gnu (>= ${version:gcc}), + gfortran-i686-linux-gnu (>= ${version:gfort}), + gfortran-${pv:gfort}-multilib-i686-linux-gnu ${reqv:gfort}, + ${misc:Depends} +Suggests: gfortran-doc +Description: GNU Fortran 95 compiler for the i386 architecture + This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms + supported by the gcc compiler. It uses the gcc backend to generate optimized + code. + . + This is a dependency package providing the default GNU Fortran 95 + cross-compiler for the i386 architecture. + +Package: gccgo-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + g++-multilib-i686-linux-gnu (>= ${version:gcc}), + gccgo-i686-linux-gnu (>= ${version:ggo}), + gccgo-${pv:ggo}-multilib-i686-linux-gnu ${reqv:ggo}, + ${misc:Depends} +Suggests: gccgo-doc +Description: Go compiler (based on GCC) for the i386 architecture + This is the GNU Go compiler, which compiles Go on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU Go cross-compiler + cross-compiler for the i386 architecture. + +Package: gdc-multilib-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: cpp-i686-linux-gnu (>= ${version:cpp}), + gdc-${pv:gdc}-multilib-i686-linux-gnu ${reqv:gdc}, + gdc-i686-linux-gnu (>= ${version:gdc}), + ${misc:Depends} +Description: GNU D compiler (based on GCC) for the i386 architecture + This is the GNU D compiler, which compiles D on platforms supported by + the gcc compiler. It uses the gcc backend to generate optimized code. + . + This is a dependency package providing the default GNU D cross-compiler + cross-compiler for the i386 architecture. + +Package: pkg-config-i686-linux-gnu +Priority: optional +Architecture: amd64 arm64 ppc64el x32 +Depends: pkg-config (>= 0.25-1.1ubuntu2), ${misc:Depends} +Description: manage compile and link flags for libraries for i386 architecture + pkg-config is a system for managing library compile and link flags that + works with automake and autoconf. + . + Increasingly libraries ship with ".pc" files that allow querying of the + compiler and linker flags needed to use them through the pkg-config(1) + program. + . + This is a dependency package providing cross pkg-config support for the + i386 architecture. + Package: cpp-doc Section: doc Architecture: any diff -Nru gcc-defaults-1.175ubuntu1/debian/control.native.in gcc-defaults-1.176ubuntu2/debian/control.native.in --- gcc-defaults-1.175ubuntu1/debian/control.native.in 2018-03-19 04:28:46.000000000 +0000 +++ gcc-defaults-1.176ubuntu2/debian/control.native.in 2018-04-06 18:04:15.000000000 +0000 @@ -92,6 +92,7 @@ gcc-7-arm-linux-gnueabi, gcc-7-arm-linux-gnueabihf, gcc-7-hppa-linux-gnu, + gcc-7-i686-linux-gnu, gcc-7-m68k-linux-gnu, gcc-7-powerpc-linux-gnu, gcc-7-powerpc-linux-gnuspe, @@ -101,15 +102,18 @@ gcc-7-mipsel-linux-gnu, gcc-7-mips64-linux-gnuabi64, gcc-7-mips64el-linux-gnuabi64, + gcc-7-riscv64-linux-gnu, gcc-7-s390x-linux-gnu, gcc-7-sh4-linux-gnu, gcc-7-sparc-linux-gnu, - gcc-7-sparc64-linux-gnu, + gcc-7-x86-64-linux-gnu, + gcc-7-x86-64-linux-gnux32, gcc-8-aarch64-linux-gnu, gcc-8-alpha-linux-gnu, gcc-8-arm-linux-gnueabi, gcc-8-arm-linux-gnueabihf, gcc-8-hppa-linux-gnu, + gcc-8-i686-linux-gnu, gcc-8-m68k-linux-gnu, gcc-8-powerpc-linux-gnu, gcc-8-powerpc-linux-gnuspe, @@ -119,15 +123,19 @@ gcc-8-mipsel-linux-gnu, gcc-8-mips64-linux-gnuabi64, gcc-8-mips64el-linux-gnuabi64, + gcc-8-riscv64-linux-gnu, gcc-8-s390x-linux-gnu, gcc-8-sh4-linux-gnu, gcc-8-sparc-linux-gnu, gcc-8-sparc64-linux-gnu, + gcc-8-x86-64-linux-gnu, + gcc-8-x86-64-linux-gnux32, gcc-9-aarch64-linux-gnu, gcc-9-alpha-linux-gnu, gcc-9-arm-linux-gnueabi, gcc-9-arm-linux-gnueabihf, gcc-9-hppa-linux-gnu, + gcc-9-i686-linux-gnu, gcc-9-m68k-linux-gnu, gcc-9-powerpc-linux-gnu, gcc-9-powerpc-linux-gnuspe, @@ -137,10 +145,13 @@ gcc-9-mipsel-linux-gnu, gcc-9-mips64-linux-gnuabi64, gcc-9-mips64el-linux-gnuabi64, + gcc-9-riscv64-linux-gnu, gcc-9-s390x-linux-gnu, gcc-9-sh4-linux-gnu, gcc-9-sparc-linux-gnu, gcc-9-sparc64-linux-gnu, + gcc-9-x86-64-linux-gnu, + gcc-9-x86-64-linux-gnux32, Description: GNU C compiler (multilib files) This is the GNU C compiler, a fairly portable optimizing compiler for C. . diff -Nru gcc-defaults-1.175ubuntu1/debian/README.Debian gcc-defaults-1.176ubuntu2/debian/README.Debian --- gcc-defaults-1.175ubuntu1/debian/README.Debian 2018-03-19 04:35:11.000000000 +0000 +++ gcc-defaults-1.176ubuntu2/debian/README.Debian 2018-03-23 23:23:18.000000000 +0000 @@ -57,7 +57,7 @@ gccgo : gccgo-8 gobjc : gobjc-7 gobjc++ : gobjc++-7 - gdc : gdc-7 + gdc : gdc-8 Documentation for the default compilers can be found in diff -Nru gcc-defaults-1.175ubuntu1/debian/rules gcc-defaults-1.176ubuntu2/debian/rules --- gcc-defaults-1.175ubuntu1/debian/rules 2018-03-23 23:15:28.000000000 +0000 +++ gcc-defaults-1.176ubuntu2/debian/rules 2018-04-06 18:04:15.000000000 +0000 @@ -335,10 +335,12 @@ phobos_archs = amd64 armel armhf i386 x32 hppa HOST_ARCHS_alpha = amd64 i386 x32 +HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 HOST_ARCHS_armhf = amd64 i386 x32 arm64 HOST_ARCHS_armel = amd64 i386 x32 arm64 HOST_ARCHS_arm64 = amd64 i386 x32 HOST_ARCHS_hppa = amd64 i386 x32 +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 HOST_ARCHS_m68k = amd64 i386 x32 HOST_ARCHS_mips = amd64 i386 x32 HOST_ARCHS_mipsel = amd64 i386 x32 @@ -352,36 +354,50 @@ HOST_ARCHS_s390x = amd64 i386 x32 HOST_ARCHS_sh4 = amd64 i386 x32 HOST_ARCHS_sparc64 = amd64 i386 x32 +HOST_ARCHS_x32 = amd64 arm64 i386 ppc64el + +ifeq (,$(CROSS_ARCHS)) + ifeq ($(SOURCE),gcc-defaults) + ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32)) + CROSS_ARCHS = s390x ppc64el arm64 armhf armel \ + $(if $(filter $(vendor), Ubuntu), powerpc, mips mipsel mips64el) \ + $(if $(filter $(DEB_HOST_ARCH), i386 x32), amd64) \ + $(if $(filter $(DEB_HOST_ARCH), amd64 x32), i386) + else ifeq ($(DEB_HOST_ARCH),arm64) + CROSS_ARCHS = amd64 armel armhf i386 + else ifeq ($(DEB_HOST_ARCH),ppc64) + CROSS_ARCHS = ppc64el + else ifeq ($(DEB_HOST_ARCH),ppc64el) + CROSS_ARCHS = amd64 i386 $(if $(filter $(vendor), Ubuntu), powerpc) + else + CROSS_ARCHS = + endif + else # -ports package + ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32)) + CROSS_ARCHS ?= alpha hppa m68k mips64 powerpcspe ppc64 riscv64 sh4 sparc64 \ + $(if $(filter $(vendor), Ubuntu), mips mipsel mips64el, powerpc) \ + $(if $(filter $(DEB_HOST_ARCH), amd64 i386), x32) + else ifeq ($(DEB_HOST_ARCH),arm64) + CROSS_ARCHS = x32 + else ifeq ($(DEB_HOST_ARCH),ppc64el) + CROSS_ARCHS = x32 $(if $(filter $(vendor), Ubuntu),, powerpc) + else + CROSS_ARCHS = + endif + endif +endif ifeq ($(SOURCE),gcc-defaults) with_native = yes - CROSS_ARCHS ?= s390x ppc64el arm64 armhf armel \ - $(if $(filter $(vendor), Ubuntu), powerpc, mips mipsel mips64el) -else - CROSS_ARCHS ?= alpha hppa m68k mips64 powerpcspe ppc64 riscv64 sh4 sparc64 \ - $(if $(filter $(vendor), Ubuntu), mips mipsel mips64el, powerpc) endif -with_cross = yes - -ifneq (, $(filter $(DEB_HOST_ARCH),amd64 i386 x32)) - # just use the default from above -else ifeq ($(DEB_HOST_ARCH),arm64) - CROSS_ARCHS = $(if $(findstring ports,$(SOURCE)),, armel armhf) -else ifeq ($(DEB_HOST_ARCH),ppc64) - CROSS_ARCHS = $(if $(findstring ports,$(SOURCE)),, ppc64el) -else ifeq ($(DEB_HOST_ARCH),ppc64el) - ifeq ($(SOURCE),gcc-defaults) - CROSS_ARCHS = $(if $(filter $(vendor), Ubuntu), powerpc) - else - CROSS_ARCHS = $(if $(filter $(vendor), Ubuntu),, powerpc) - endif -else - CROSS_ARCHS = +ifneq (,$(CROSS_ARCHS)) + with_cross = yes endif CROSS_ARCH = $(subst .,,$(suffix $@)) _gnu_type = $(shell dpkg-architecture -a$(1) -qDEB_HOST_GNU_TYPE -f) CROSS_GNU_TYPE = $(call _gnu_type,${CROSS_ARCH}) +CROSS_PKG_GNU_TYPE = $(subst _,-,$(call _gnu_type,${CROSS_ARCH})) all_packages := ifeq ($(with_native),yes) @@ -715,10 +731,10 @@ endif ifeq ($(with_cross),yes) : # FIXME: filter-out some gdc and gccgo multilib configs - $(foreach a,$(CROSS_ARCHS), \ + $(foreach a, amd64 $(CROSS_ARCHS), \ sed \ -e "s/CROSS_ARCH/$(a)/g" \ - -e 's/CROSS_GNU_TYPE/$(call _gnu_type,$(a))/g' \ + -e 's/CROSS_GNU_TYPE/$(subst _,-,$(call _gnu_type,$(a)))/g' \ -e 's/@host_archs@/$(HOST_ARCHS_$(a))/g' \ debian/control.cross.in \ $(if $(filter $(a),$(multilib_archs)), debian/control.cross-ml.in) \ @@ -1169,23 +1185,23 @@ endif # with_native install.%: pre-install - for p in $(filter %-$(CROSS_GNU_TYPE), $(all_packages)); do \ + for p in $(filter %-$(CROSS_PKG_GNU_TYPE), $(all_packages)); do \ cp -l debian/substvars.$(CROSS_ARCH) debian/$$p.substvars; \ done - : # cpp-$(CROSS_GNU_TYPE) - dh_installdirs -pcpp-$(CROSS_GNU_TYPE) - dh_link -pcpp-$(CROSS_GNU_TYPE) \ + : # cpp-$(CROSS_PKG_GNU_TYPE) + dh_installdirs -pcpp-$(CROSS_PKG_GNU_TYPE) + dh_link -pcpp-$(CROSS_PKG_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-cpp-$(PV_CPP_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-cpp $(if $(filter yes, $(with_gfdl_docs)), \ - dh_link -pcpp-$(CROSS_GNU_TYPE) \ + dh_link -pcpp-$(CROSS_PKG_GNU_TYPE) \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-cpp-$(PV_CPP_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-cpp.1.gz \ ) - : # gcc-$(CROSS_GNU_TYPE) - dh_installdirs -pgcc-$(CROSS_GNU_TYPE) - dh_link -pgcc-$(CROSS_GNU_TYPE) \ + : # gcc-$(CROSS_PKG_GNU_TYPE) + dh_installdirs -pgcc-$(CROSS_PKG_GNU_TYPE) + dh_link -pgcc-$(CROSS_PKG_GNU_TYPE) \ /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 \ @@ -1194,7 +1210,7 @@ /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 \ ) - dh_link -pgcc-$(CROSS_GNU_TYPE) \ + dh_link -pgcc-$(CROSS_PKG_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gcc-ar-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcc-ar \ /usr/bin/$(CROSS_GNU_TYPE)-gcc-nm-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcc-nm \ /usr/bin/$(CROSS_GNU_TYPE)-gcc-ranlib-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcc-ranlib \ @@ -1211,7 +1227,7 @@ : # debian/gcc.postinst.in > debian/gcc.postinst $(if $(filter yes, $(with_gfdl_docs)), \ - dh_link -pgcc-$(CROSS_GNU_TYPE) \ + dh_link -pgcc-$(CROSS_PKG_GNU_TYPE) \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcc-$(PV_GCC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcc.1.gz \ /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)),, \ @@ -1221,34 +1237,34 @@ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-dump.1.gz) \ ) - : # gdc-$(CROSS_GNU_TYPE) - $(if $(filter gdc-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgdc-$(CROSS_GNU_TYPE); \ - dh_installdocs -pgdc-$(CROSS_GNU_TYPE) \ + : # gdc-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gdc-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgdc-$(CROSS_PKG_GNU_TYPE); \ + dh_installdocs -pgdc-$(CROSS_PKG_GNU_TYPE) \ debian/README.Debian; \ - dh_link -pgdc-$(CROSS_GNU_TYPE) \ + dh_link -pgdc-$(CROSS_PKG_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gdc-$(PV_GDC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gdc \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gdc-$(PV_GDC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gdc.1.gz; \ ) - : # gobjc-$(CROSS_GNU_TYPE) - $(if $(filter gobjc-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgobjc-$(CROSS_GNU_TYPE); \ - dh_link -pgobjc-$(CROSS_GNU_TYPE) \ + : # gobjc-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gobjc-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgobjc-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgobjc-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gobjc-$(CROSS_GNU_TYPE); \ ) - : # gobjc++-$(CROSS_GNU_TYPE) - $(if $(filter gobjc++-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgobjc++-$(CROSS_GNU_TYPE); \ - dh_link -pgobjc++-$(CROSS_GNU_TYPE) \ + : # gobjc++-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gobjc++-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgobjc++-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgobjc++-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gobjc++-$(CROSS_GNU_TYPE); \ ) - : # g++-$(CROSS_GNU_TYPE) - $(if $(filter g++-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pg++-$(CROSS_GNU_TYPE); \ - dh_link -pg++-$(CROSS_GNU_TYPE) \ + : # g++-$(CROSS_PKG_GNU_TYPE) + $(if $(filter g++-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pg++-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pg++-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/g++-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-g++-$(PV_GPP_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-g++ \ $(if $(filter yes, $(with_gfdl_docs)), \ @@ -1258,10 +1274,10 @@ : # debian/g++.postinst.in > debian/g++.postinst; \ ) - : # gfortran-$(CROSS_GNU_TYPE) - $(if $(filter gfortran-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgfortran-$(CROSS_GNU_TYPE); \ - dh_link -pgfortran-$(CROSS_GNU_TYPE) \ + : # gfortran-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gfortran-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgfortran-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgfortran-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gfortran-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gfortran-$(PV_GFORT_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gfortran \ $(if $(filter yes, $(with_gfdl_docs)), \ @@ -1271,10 +1287,10 @@ : # debian/gfortran.postinst.in > debian/gfortran.postinst; \ ) - : # gccgo-$(CROSS_GNU_TYPE) - $(if $(filter gccgo-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgccgo-$(CROSS_GNU_TYPE); \ - dh_link -pgccgo-$(CROSS_GNU_TYPE) \ + : # gccgo-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gccgo-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgccgo-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgccgo-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gccgo-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gccgo-$(PV_GGO_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gccgo \ $(if $(filter yes, $(with_gfdl_docs)), \ @@ -1283,10 +1299,10 @@ ) ifneq (,$(gcj_archs)) - : # gcj-$(CROSS_GNU_TYPE) - $(if $(filter gcj-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgcj-$(CROSS_GNU_TYPE); \ - dh_link -pgcj-$(CROSS_GNU_TYPE) \ + : # gcj-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gcj-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgcj-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgcj-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gcj-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gcj-$(PV_GCJ_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcj \ $(if $(filter yes, $(with_gfdl_docs)), \ @@ -1295,10 +1311,10 @@ ) endif - : # gnat-$(CROSS_GNU_TYPE) - $(if $(filter gnat-$(CROSS_GNU_TYPE), $(packages)), \ - dh_installdirs -pgnat-$(CROSS_GNU_TYPE); \ - dh_link -pgnat-$(CROSS_GNU_TYPE) \ + : # gnat-$(CROSS_PKG_GNU_TYPE) + $(if $(filter gnat-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_installdirs -pgnat-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgnat-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gnat-$(CROSS_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gnat-$(PV_GPP_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gnat \ /usr/bin/$(CROSS_GNU_TYPE)-gnatbind-$(PV_GPP_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gnatbind \ @@ -1324,8 +1340,8 @@ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnatprep-$(PV_GPP_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnatprep.1.gz \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnatxref-$(PV_GPP_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnatxref.1.gz \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnathtml-$(PV_GPP_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gnathtml.1.gz; \ - dh_installdirs -pgnat-sjlj-$(CROSS_GNU_TYPE); \ - dh_link -pgnat-sjlj-$(CROSS_GNU_TYPE) \ + dh_installdirs -pgnat-sjlj-$(CROSS_PKG_GNU_TYPE); \ + dh_link -pgnat-sjlj-$(CROSS_PKG_GNU_TYPE) \ /usr/share/doc/cpp-$(CROSS_GNU_TYPE) /usr/share/doc/gnat-sjlj-$(CROSS_GNU_TYPE); \ ) @@ -1499,13 +1515,13 @@ binary.%: build-arch install dh_testdir dh_testroot - dh_installdocs -pcpp-$(CROSS_GNU_TYPE) \ - $(if $(filter pkg-config-$(CROSS_GNU_TYPE), $(packages)),-ppkg-config-$(CROSS_GNU_TYPE)) + dh_installdocs -pcpp-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter pkg-config-$(CROSS_PKG_GNU_TYPE), $(packages)),-ppkg-config-$(CROSS_PKG_GNU_TYPE)) - for p in $(filter %-$(CROSS_GNU_TYPE),$(cross_packages)); do \ + for p in $(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)); do \ case "$$p" in \ cpp-*|pkg-config-*) continue;; \ - *-gnu*|*-kfreebsd*) t=cpp-$(CROSS_GNU_TYPE);; \ + *-gnu*|*-kfreebsd*) t=cpp-$(CROSS_PKG_GNU_TYPE);; \ *) continue;; \ esac; \ echo ln -sf $$t debian/$$p/usr/share/doc/$$p; \ @@ -1514,22 +1530,22 @@ ln -sf $$t debian/$$p/usr/share/doc/$$p; \ done - dh_installchangelogs -pcpp-$(CROSS_GNU_TYPE) \ - $(if $(filter pkg-config-$(CROSS_GNU_TYPE), $(packages)),-ppkg-config-$(CROSS_GNU_TYPE)) - for i in cpp-$(CROSS_GNU_TYPE) $(if $(filter pkg-config-$(CROSS_GNU_TYPE), $(packages)),pkg-config-$(CROSS_GNU_TYPE)); do \ + dh_installchangelogs -pcpp-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter pkg-config-$(CROSS_PKG_GNU_TYPE), $(packages)),-ppkg-config-$(CROSS_PKG_GNU_TYPE)) + for i in cpp-$(CROSS_PKG_GNU_TYPE) $(if $(filter pkg-config-$(CROSS_PKG_GNU_TYPE), $(packages)),pkg-config-$(CROSS_PKG_GNU_TYPE)); do \ mv debian/$$i/usr/share/doc/$$i/changelog \ debian/$$i/usr/share/doc/$$i/changelog.Debian; \ done - dh_compress $(foreach p,$(filter %-$(CROSS_GNU_TYPE),$(cross_packages)),-p$(p)) \ + dh_compress $(foreach p,$(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)),-p$(p)) \ -XREADME.Debian - $(if $(filter pkg-config-$(CROSS_GNU_TYPE), $(packages)), \ - dh_link -ppkg-config-$(CROSS_GNU_TYPE) \ + $(if $(filter pkg-config-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_link -ppkg-config-$(CROSS_PKG_GNU_TYPE) \ /usr/share/pkg-config-crosswrapper /usr/bin/${CROSS_GNU_TYPE}-pkg-config \ ) - for p in $(filter %-$(CROSS_GNU_TYPE),$(cross_packages)); do \ + for p in $(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)); do \ case $$p in \ - cpp-$(CROSS_GNU_TYPE)|g++-$(CROSS_GNU_TYPE)|gcc-$(CROSS_GNU_TYPE)|gccgo-$(CROSS_GNU_TYPE)|gcj-$(CROSS_GNU_TYPE)|gfortran-$(CROSS_GNU_TYPE)) \ + cpp-$(CROSS_PKG_GNU_TYPE)|g++-$(CROSS_PKG_GNU_TYPE)|gcc-$(CROSS_PKG_GNU_TYPE)|gccgo-$(CROSS_PKG_GNU_TYPE)|gcj-$(CROSS_PKG_GNU_TYPE)|gfortran-$(CROSS_PKG_GNU_TYPE)) \ [ "$(with_gfdl_docs)" = yes ] && continue; \ mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \ echo "$$p binary: binary-without-manpage" \ @@ -1537,66 +1553,66 @@ esac; \ done - dh_fixperms $(foreach p,$(filter %-$(CROSS_GNU_TYPE),$(cross_packages)),-p$(p)) - dh_installdeb $(foreach p,$(filter %-$(CROSS_GNU_TYPE),$(cross_packages)),-p$(p)) - dh_gencontrol -pcpp-$(CROSS_GNU_TYPE) '-u-v$(EPOCH):$(CV_CPP_$(CROSS_ARCH))' - dh_gencontrol -pgcc-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgcc-multilib-$(CROSS_GNU_TYPE)) \ + dh_fixperms $(foreach p,$(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)),-p$(p)) + dh_installdeb $(foreach p,$(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)),-p$(p)) + dh_gencontrol -pcpp-$(CROSS_PKG_GNU_TYPE) '-u-v$(EPOCH):$(CV_CPP_$(CROSS_ARCH))' + dh_gencontrol -pgcc-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgcc-multilib-$(CROSS_PKG_GNU_TYPE)) \ '-u-v$(EPOCH):$(CV_GCC_$(CROSS_ARCH))' - $(if $(filter gdc-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgdc-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(d_multilib_archs)),-pgdc-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter gdc-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgdc-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(d_multilib_archs)),-pgdc-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GDC_$(CROSS_ARCH)) \ ) - $(if $(filter g++-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pg++-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pg++-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter g++-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pg++-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pg++-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GPP_$(CROSS_ARCH)) \ ) - $(if $(filter gobjc++-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgobjc-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgobjc-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter gobjc++-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgobjc-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgobjc-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GOBJC_$(CROSS_ARCH)) \ ) - $(if $(filter gobjc++-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgobjc++-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgobjc++-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter gobjc++-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgobjc++-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgobjc++-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GOBJCXX_$(CROSS_ARCH)) \ ) - $(if $(filter gfortran-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgfortran-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgfortran-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter gfortran-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgfortran-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(multilib_archs)),-pgfortran-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GFORT_$(CROSS_ARCH)) \ ) - $(if $(filter gccgo-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgccgo-$(CROSS_GNU_TYPE) \ - $(if $(filter $(CROSS_ARCH),$(go_multilib_archs)),-pgccgo-multilib-$(CROSS_GNU_TYPE)) \ + $(if $(filter gccgo-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgccgo-$(CROSS_PKG_GNU_TYPE) \ + $(if $(filter $(CROSS_ARCH),$(go_multilib_archs)),-pgccgo-multilib-$(CROSS_PKG_GNU_TYPE)) \ -u-v$(EPOCH):$(CV_GGO_$(CROSS_ARCH)) \ ) - $(if $(filter gcj-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgcj-$(CROSS_GNU_TYPE) \ + $(if $(filter gcj-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgcj-$(CROSS_PKG_GNU_TYPE) \ -u-v$(EPOCH):$(CV_GCJ_$(CROSS_ARCH)) \ ) - $(if $(filter gnat-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -pgnat-$(CROSS_GNU_TYPE) -pgnat-sjlj-$(CROSS_GNU_TYPE) \ + $(if $(filter gnat-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -pgnat-$(CROSS_PKG_GNU_TYPE) -pgnat-sjlj-$(CROSS_PKG_GNU_TYPE) \ -u-v$(EPOCH):$(CV_GNAT_$(CROSS_ARCH)) \ ) - $(if $(filter pkg-config-$(CROSS_GNU_TYPE), $(packages)), \ - dh_gencontrol -ppkg-config-$(CROSS_GNU_TYPE) \ + $(if $(filter pkg-config-$(CROSS_PKG_GNU_TYPE), $(packages)), \ + dh_gencontrol -ppkg-config-$(CROSS_PKG_GNU_TYPE) \ -u-v$(EPOCH):$(CV_GCC_$(CROSS_ARCH)) \ ) - dh_md5sums $(foreach p,$(filter %-$(CROSS_GNU_TYPE),$(cross_packages)),-p$(p)) - dh_builddeb $(foreach p,$(filter %-$(CROSS_GNU_TYPE),$(cross_packages)),-p$(p)) + dh_md5sums $(foreach p,$(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)),-p$(p)) + dh_builddeb $(foreach p,$(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)),-p$(p)) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install substvars