From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 4 Nov 2021 19:01:05 +0000 (+0000)
Subject: Manual merge of version 1.190+rpi1 and 1.194 to produce 1.194+rpi1
X-Git-Tag: archive/raspbian/1.194+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=683c530545339d3db77402170b6ebf3b918f84d9;p=gcc-defaults.git

Manual merge of version 1.190+rpi1 and 1.194 to produce 1.194+rpi1
---

683c530545339d3db77402170b6ebf3b918f84d9
diff --cc debian/changelog
index 822c34a,bb4511b..2b7a96a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,26 +1,37 @@@
- gcc-defaults (1.190+rpi1) bullseye-staging; urgency=medium
++gcc-defaults (1.194+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.189+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jan 2021 00:20:31 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 04 Nov 2021 18:17:19 +0000
++
+ gcc-defaults (1.194) unstable; urgency=medium
+ 
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 10 Oct 2021 18:42:59 +0200
+ 
+ gcc-defaults (1.193) experimental; urgency=medium
+ 
+   * Bump GCC 10 version to 10.3.0.
+   * Bump GCC 11 version to 11.2.0.
+   * Also don't build the gccgo-doc package when not building gccgo.
+     LP: #1562598.
+   * d/rules: Factor-out mips* architectures into macros (Yunqiang Su).
+   * Stop building the cross pkg-config packages for Ubuntu.
+   * Drop references to powerpcspe.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 05 Aug 2021 09:21:17 +0200
+ 
+ gcc-defaults (1.192) experimental; urgency=medium
+ 
+   * Default to GCC 11.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 23 Jan 2021 12:25:44 +0100
  
  gcc-defaults (1.190) unstable; urgency=medium
  
diff --cc debian/rules
index 7439368,fb8a94e..6729e71
--- a/debian/rules
+++ b/debian/rules
@@@ -334,34 -341,26 +341,26 @@@ brig_archs = amd64 i386 x3
  hppa64_archs = amd64 hppa i386 x32
  phobos_archs = amd64 armel armhf arm64 i386 x32 kfreebsd-amd64 kfreebsd-i386 \
  	hppa riscv64 s390x \
- 	mips64 mipsel mips64el mipsn32 mipsn32el \
- 	mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
+ 	$(all_archs_mips) \
  
  m2_archs = alpha amd64 arm64 armel armhf i386 ia64 \
- 	mips64 mipsel mips64el mipsn32 mipsn32el \
- 	mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el \
+ 	$(all_archs_mips) \
  	ppc64el riscv64 s390 s390x sparc64
  
+ mipsen_archs = amd64 i386 x32 mips64el mipsel mips64r6el arm64 ppc64el
+ 
  HOST_ARCHS_alpha = amd64 i386 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_i386 = amd64 arm64 ppc64el x32
 +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 armhf
  HOST_ARCHS_m68k = amd64 i386 x32
- HOST_ARCHS_mipsel = amd64 i386 x32 mips64el
- HOST_ARCHS_mips64 = amd64 i386 x32 mips64el
- HOST_ARCHS_mips64el = amd64 i386 x32 mips64el
- HOST_ARCHS_mipsr6 = amd64 i386 x32 mips64el
- HOST_ARCHS_mipsr6el = amd64 i386 x32 mips64el
- HOST_ARCHS_mips64r6 = amd64 i386 x32 mips64el
- HOST_ARCHS_mips64r6el = amd64 i386 x32 mips64el
  HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
- HOST_ARCHS_powerpcspe = amd64 i386 x32
  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
@@@ -723,10 -721,12 +724,12 @@@ ifeq ($(SOURCE),gcc-defaults
  	  -e "s/@hppa64_archs@/$(hppa64_archs)/g" \
  	  debian/control.hppa64.in  >> debian/control
  endif
- 	dh_listpackages > /dev/null
+ ifeq ($(SOURCE),gcc-defaults-mipsen)
+ 	sed -i 's/^Uploaders: \(.*\)/Uploaders: \1, YunQiang Su <syq@debian.org>/g' debian/control
+ endif
  ifeq ($(with_cross),yes)
  	: # FIXME: filter-out some gdc and gccgo multilib configs
 -	$(foreach a, $(if $(filter gcc-defaults, $(SOURCE)),amd64) $(CROSS_ARCHS), \
 +	$(foreach a, $(if $(filter gcc-defaultsxxx, $(SOURCE)),amd64) $(CROSS_ARCHS), \
  	  sed \
  	    -e "s/CROSS_ARCH/$(a)/g" \
  	    -e 's/CROSS_GNU_TYPE/$(subst _,-,$(call _gnu_type,$(a)))/g' \