From: Peter Michael Green Date: Sat, 21 Oct 2023 19:52:03 +0000 (+0000) Subject: Manual merge of version 1.203+rpi1 and 1.208 to produce 1.208+rpi1 X-Git-Tag: archive/raspbian/1.208+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=659e991c26a352d56c5851dbbb048ae6ccf7ac5c;p=gcc-defaults.git Manual merge of version 1.203+rpi1 and 1.208 to produce 1.208+rpi1 --- 659e991c26a352d56c5851dbbb048ae6ccf7ac5c diff --cc debian/changelog index 9d6edf3,b10a282..b41b430 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,28 +1,39 @@@ - gcc-defaults (1.203+rpi1) bookworm-staging; urgency=medium ++gcc-defaults (1.208+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 1.189+rpi1 by Peter Michael Green at Sat, 26 Sep 2020 14:33:38 +0000] + * Build enough cross-compiler packages on armhf + to support u-boot build. + * Add some debugging to the control file generation to see where + duplicate package entries are coming from. + * Prevent double generation of entries for amd64 cross-compilers. + - -- Peter Michael Green Thu, 01 Jun 2023 19:10:05 +0000 ++ -- Peter Michael Green Sat, 21 Oct 2023 19:51:37 +0000 ++ + gcc-defaults (1.208) unstable; urgency=medium + + * Bump GCC 13 version to 13.2.0. + * Build riscv64 packages from this source package. + * Build alpha hppa m68k sh4 sparc64 cross packages on arm64 and ppc64el. + + -- Matthias Klose Fri, 11 Aug 2023 20:13:58 +0200 + + gcc-defaults (1.207) unstable; urgency=medium + + * Upload to unstable, defaulting to GCC 13. + + -- Matthias Klose Thu, 13 Jul 2023 14:08:06 +0200 + + gcc-defaults (1.206) experimental; urgency=medium + + * Fix liblto_plugin.so symlink. Closes: #1035521. + + -- Matthias Klose Thu, 22 Jun 2023 15:55:43 +0200 + + gcc-defaults (1.204) experimental; urgency=medium + + * Default to GCC 13.1. + + -- Matthias Klose Mon, 01 May 2023 09:22:48 +0200 gcc-defaults (1.203) unstable; urgency=medium diff --cc debian/control index 4d1fee8,dac97d2..44aa158 --- a/debian/control +++ b/debian/control @@@ -1082,155 -1896,14 +1081,155 @@@ Description: GNU D compiler (based on G This is a dependency package providing the default GNU D cross-compiler for the i386 architecture. - Package: gm2-doc - Section: doc - Architecture: any - Priority: optional - Depends: gm2-${pv:gm2}-doc ${reqv:gm2}, ${misc:Depends} - Suggests: gm2 (>= ${version:gm2}) - Breaks: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) - Replaces: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) - Description: Documentation for the GNU Modula-2 compiler - Documentation for the GNU Modula-2 compiler in info format (dependency - package). - +Package: cpp-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Section: interpreters +Depends: cpp-${pv:cpp}-riscv64-linux-gnu ${reqv:cpp}, ${misc:Depends} +Suggests: cpp-doc +Description: GNU C preprocessor (cpp) for the riscv64 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 riscv64 architecture. + . + This is a dependency package providing the default GNU C preprocessor + for the riscv64 architecture. + +Package: gcc-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (= ${version:cpp}), + gcc-${pv:gcc}-riscv64-linux-gnu ${reqv:gcc}, + ${misc:Depends} +Recommends: libc6-dev-riscv64-cross | libc-dev-riscv64-cross +Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-riscv64-linux-gnu, gcc-doc +Description: GNU C compiler for the riscv64 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 riscv64 architecture. + +Package: g++-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (= ${version:cpp}), + gcc-riscv64-linux-gnu (= ${version:cpp}), + g++-${pv:gpp}-riscv64-linux-gnu ${reqv:gpp}, + ${misc:Depends} +Description: GNU C++ compiler for the riscv64 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 riscv64 architecture. + +Package: gobjc-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (>= ${version:cpp}), + gcc-riscv64-linux-gnu (>= ${version:cpp}), + gobjc-${pv:gobjc}-riscv64-linux-gnu ${reqv:gobjc}, + ${misc:Depends} +Description: GNU Objective-C compiler for the riscv64 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 riscv64 architecture. + +Package: gobjc++-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (>= ${version:cpp}), + gcc-riscv64-linux-gnu (>= ${version:cpp}), + gobjc++-${pv:gobjcxx}-riscv64-linux-gnu ${reqv:gobjcxx}, + ${misc:Depends} +Recommends: g++-riscv64-linux-gnu (>= ${version:cpp}), gobjc-riscv64-linux-gnu (>= ${version:cpp}) +Description: GNU Objective-C++ compiler for the riscv64 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 riscv64 architecture. + +Package: gfortran-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (= ${version:cpp}), + gcc-riscv64-linux-gnu (= ${version:gcc}), + gfortran-${pv:gfort}-riscv64-linux-gnu ${reqv:gfort}, + ${misc:Depends} +Suggests: gfortran-doc +Description: GNU Fortran 95 compiler for the riscv64 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 riscv64 architecture. + +Package: gccgo-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (>= ${version:cpp}), + g++-riscv64-linux-gnu (>= ${version:gcc}), + gccgo-${pv:ggo}-riscv64-linux-gnu ${reqv:ggo}, + ${misc:Depends} +Suggests: gccgo-doc +Description: Go compiler (based on GCC) for the riscv64 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 riscv64 architecture. + +Package: gdc-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (>= ${version:cpp}), + gdc-${pv:gdc}-riscv64-linux-gnu ${reqv:gdc}, + ${misc:Depends} +Description: GNU D compiler (based on GCC) for the riscv64 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 riscv64 architecture. + +Package: gm2-riscv64-linux-gnu +Priority: optional +Architecture: amd64 i386 x32 arm64 ppc64el armhf +Multi-Arch: foreign +Depends: cpp-riscv64-linux-gnu (>= ${version:cpp}), + gm2-${pv:gm2}-riscv64-linux-gnu ${reqv:gm2}, + ${misc:Depends} +Description: GNU Modula-2 compiler (based on GCC) for the riscv64 architecture + This is the GNU Modula-2 compiler, which compiles Modula-2 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 Modula-2 cross-compiler + for the riscv64 architecture. ++ + Package: gm2-doc + Section: doc + Architecture: any + Priority: optional + Depends: gm2-${pv:gm2}-doc ${reqv:gm2}, ${misc:Depends} + Suggests: gm2 (>= ${version:gm2}) + Breaks: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) + Replaces: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) + Description: Documentation for the GNU Modula-2 compiler + Documentation for the GNU Modula-2 compiler in info format (dependency + package). diff --cc debian/rules index 7f32a03,212fd83..ac35621 --- a/debian/rules +++ b/debian/rules @@@ -355,22 -361,22 +361,22 @@@ m2_archs = alpha arc amd64 arm64 armel mipsen_archs = amd64 i386 x32 mips64el mipsel mips64r6el arm64 ppc64el - HOST_ARCHS_alpha = amd64 i386 x32 - HOST_ARCHS_arc = amd64 i386 x32 + HOST_ARCHS_alpha = amd64 arm64 i386 ppc64el x32 + HOST_ARCHS_arc = amd64 arm64 i386 ppc64el x32 -HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 +HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 armhf HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el -HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el +HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el armhf - HOST_ARCHS_hppa = amd64 i386 x32 + HOST_ARCHS_hppa = amd64 arm64 i386 ppc64el x32 -HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 armhf - HOST_ARCHS_m68k = amd64 i386 x32 - HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el + HOST_ARCHS_m68k = amd64 arm64 i386 ppc64el x32 + HOST_ARCHS_powerpc = amd64 arm64 i386 x32 ppc64el HOST_ARCHS_ppc64 = amd64 i386 x32 ppc64el HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64 -HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el +HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el armhf HOST_ARCHS_s390x = amd64 i386 x32 arm64 ppc64el - HOST_ARCHS_sh4 = amd64 i386 x32 - HOST_ARCHS_sparc64 = amd64 i386 x32 + HOST_ARCHS_sh4 = amd64 arm64 i386 ppc64el x32 + HOST_ARCHS_sparc64 = amd64 arm64 i386 ppc64el x32 HOST_ARCHS_x32 = amd64 arm64 i386 ppc64el $(foreach a, $(all_archs_mips), \ $(eval HOST_ARCHS_$(a) = $(filter-out $(a), $(mipsen_archs))) \ @@@ -384,9 -390,8 +390,10 @@@ ifeq (,$(CROSS_ARCHS) $(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 ppc64el s390x + CROSS_ARCHS = amd64 armel armhf i386 ppc64el riscv64 s390x \ + $(if $(filter $(vendor), Ubuntu), powerpc) + else ifeq ($(DEB_HOST_ARCH),armhf) + CROSS_ARCHS = amd64 arm64 i386 riscv64 else ifeq ($(DEB_HOST_ARCH),ppc64) CROSS_ARCHS = ppc64el else ifeq ($(DEB_HOST_ARCH),ppc64el)