diff -Nru gcc-defaults-1.150/debian/changelog gcc-defaults-1.150+rpi1/debian/changelog --- gcc-defaults-1.150/debian/changelog 2015-12-13 15:14:15.000000000 +0000 +++ gcc-defaults-1.150+rpi1/debian/changelog 2015-12-27 04:02:49.000000000 +0000 @@ -1,3 +1,17 @@ +gcc-defaults (1.150+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.138+rpi1 by Peter Michael Green at Sun, 31 May 2015 11:25:58 +0000] + * Revert gdc to 4.9.x since 5.x gdc won't build in raspbian. + and gdc pakcage is hence uninstallable. + + [changes brought forward from 1.145+rpi2 by Peter Michael Green at Mon, 07 Sep 2015 09:45:15 +0000] + * Fix a copy/paste screwup that made gdc uninstallable. + + [changes brought forward from 1.145+rpi3 by Peter Michael Green at Sun, 29 Nov 2015 03:01:56 +0000] + * Rebuild due to previous binnmu of non binnmu safe package. + + -- Raspbian forward porter Sun, 27 Dec 2015 04:02:48 +0000 + gcc-defaults (1.150) unstable; urgency=medium * Bump GCC 5 version to 5.3.1. diff -Nru gcc-defaults-1.150/debian/rules gcc-defaults-1.150+rpi1/debian/rules --- gcc-defaults-1.150/debian/rules 2015-12-08 14:26:16.000000000 +0000 +++ gcc-defaults-1.150+rpi1/debian/rules 2015-12-27 04:17:19.000000000 +0000 @@ -197,7 +197,7 @@ CV_GCJ := 5.3.1-$(REL_NO_53) CV_GIJ := 5.3.1-$(REL_NO_53) CV_LIBGCJBC := 5.3.1-$(REL_NO_53) -CV_GDC := 5.3.1-$(REL_NO_53) +CV_GDC := 5.3.1-$(REL_NO_53)~really4.9.3 CV_LIBGCJCOMMON := 1:4.9.3-$(REL_NO_493) $(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, \ @@ -243,7 +243,7 @@ REQV_GNAT = $(REQV_5) REQV_GCJ = $(REQV_5) REQV_GIJ = $(REQV_5) -REQV_GDC = $(REQV_5) +REQV_GDC = $(REQV_49) $(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, \ $(eval $(v)_$(a) = $(call $(v))))) @@ -462,6 +462,10 @@ $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ $(eval $(v) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)))),%,$(call C$(v)))) \ ) + +#force gdc version number as the block above won't handle our "really" version. +V_GDC := 4.9.3 + $(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, \ $(eval $(v)_$(a) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)_$(a)))),%,$(call C$(v)_$(a)))) \ @@ -471,6 +475,9 @@ $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ $(eval P$(v) = $(firstword $(subst ., ,$(call $(v))))) \ ) +# fixup PV_GDC +PV_GDC := 4.9 + $(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, \ $(eval P$(v)_$(a) = $(firstword $(subst ., ,$(call $(v)_$(a))))) \