Package: gcc-default Version: 1.71 Severity: wishlist Tags: patch
Hi, Now that gcc-4.3 4.3.0-5 is installed on i386/amd64 with the -mcld switch turned on by default there is no more reason not to make it the default. Here is a patch to do it, I will NMU on May 30 if it is not uploaded. Thanks, Arthur.
From 11ed7202154729cb5d27c0fb6c3d43c72438b44c Mon Sep 17 00:00:00 2001
From: Arthur Loiret <[EMAIL PROTECTED]>
Date: Sun, 25 May 2008 18:17:16 +0200
Subject: [PATCH] * Make GCC-4.3 the default on i386 and amd64:
- gcc-4.3 4.3.0-5 has the -mcld switch turned on by default.
- Build-Depends on gcc-4.3-base >= 4.3.0-5 on i386 amd64.
- Set REQV_43 to (>= 4.3.0-5) on i386 amd64.
* Update debian/rules, now only alpha still uses GCC-4.2
---
gcc-defaults/debian/changelog | 11 ++++++++
gcc-defaults/debian/control | 2 +-
gcc-defaults/debian/rules | 54 ++++++++++++++++++++++-------------------
3 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/gcc-defaults/debian/changelog b/gcc-defaults/debian/changelog
index 43df289..0c5ee19 100644
--- a/gcc-defaults/debian/changelog
+++ b/gcc-defaults/debian/changelog
@@ -1,3 +1,14 @@
+gcc-defaults (1.72) unstable; urgency=low
+
+ [Arthur Loiret]
+ * Make GCC-4.3 the default on i386 and amd64:
+ - gcc-4.3 4.3.0-5 has the -mcld switch turned on by default.
+ - Build-Depends on gcc-4.3-base >= 4.3.0-5 on i386 amd64.
+ - Set REQV_43 to (>= 4.3.0-5) on i386 amd64.
+ * Update debian/rules, now only alpha still uses GCC-4.2.
+
+ -- Matthias Klose <[EMAIL PROTECTED]> Sun, 25 May 2008 18:23:39 +0200
+
gcc-defaults (1.71) unstable; urgency=high
[Arthur Loiret]
diff --git a/gcc-defaults/debian/control b/gcc-defaults/debian/control
index f826221..f23d968 100644
--- a/gcc-defaults/debian/control
+++ b/gcc-defaults/debian/control
@@ -4,7 +4,7 @@ Priority: standard
Maintainer: Debian GCC Maintainers <[EMAIL PROTECTED]>
Uploaders: Matthias Klose <[EMAIL PROTECTED]>
Standards-Version: 3.7.3
-Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.13.9), gcj-4.3-base (>= 4.3.0-1) [!hurd-i386 !alpha !arm !hppa !sh3 !sh4], gcc-4.2-base (>= 4.2.3-1), gcc-4.3-base (>= 4.3.0-1), gnat-4.3-base [alpha amd64 hppa i386 ia64 lpia mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386], lsb-release
+Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.13.9), gcj-4.3-base (>= 4.3.0-1) [!hurd-i386 !alpha !arm !hppa !sh3 !sh4], gcc-4.2-base (>= 4.2.3-1), gcc-4.3-base (>= 4.3.0-1), gcc-4.3-base (>= 4.3.0-5) [i386 amd64], gnat-4.3-base [alpha amd64 hppa i386 ia64 lpia mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386], lsb-release
Package: cpp
Priority: optional
diff --git a/gcc-defaults/debian/rules b/gcc-defaults/debian/rules
index dde2bea..96d2925 100755
--- a/gcc-defaults/debian/rules
+++ b/gcc-defaults/debian/rules
@@ -10,6 +10,10 @@ VMAJOR := $(shell echo $(VDEF) | awk -F. '{print $$1}')
VMINOR := $(shell echo $(VDEF) | awk -F. '{print $$2}' | sed -e 's/\([0-9]*\).*/\1/')
REL_EXT := $(shell echo $(VDEF) | sed -e 's/^$(VMAJOR)\.$(VMINOR)//')
+# architecture dependent variables
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
# gcc-defaults 0.8 is the first version for 2.95.4.
REL_NO_295 := $(shell expr $(VMINOR) + 15)$(REL_EXT)
# gcc-defaults 0.6 is the first version with 2.96 support.
@@ -101,19 +105,19 @@ REQV_43 := (>= 4.3.0-1)
REQV_LIBGCJ_BC := (>= 4.3.0-1)
-# architecture dependent variables
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq (,$(filter $(DEB_HOST_ARCH), i386 amd64))
+ REQV_43 := (>= 4.3.0-5)
+endif
# CV_XXX is the complete version number, including the release, without epoch
CV_CHILL:= 2.95.4-$(REL_NO_295)
CV_GPC := 3.4.6-$(REL_NO_346)
-CV_CPP := 4.2.3-$(REL_NO_423)
-CV_GCC := 4.2.3-$(REL_NO_423)
-CV_GPP := 4.2.3-$(REL_NO_423)
-CV_GOBJC := 4.2.3-$(REL_NO_423)
-CV_GOBJCXX := 4.2.3-$(REL_NO_423)
+CV_CPP := 4.3.0-$(REL_NO_430)
+CV_GCC := 4.3.0-$(REL_NO_430)
+CV_GPP := 4.3.0-$(REL_NO_430)
+CV_GOBJC := 4.3.0-$(REL_NO_430)
+CV_GOBJCXX := 4.3.0-$(REL_NO_430)
CV_GFORT := 4.3.0-$(REL_NO_430)
CV_GCJ := 4.3.0-$(REL_NO_430)
CV_GIJ := 4.3.0-$(REL_NO_430)
@@ -124,22 +128,22 @@ CV_GDC := 4.1.2-$(REL_NO_412)
CV_LIBGCJCOMMON := 1:4.3.0-$(REL_NO_430)
CV_SPU := 4.3.0-$(REL_NO_430)
-ifeq (,$(filter $(DEB_HOST_ARCH), alpha amd64 i386))
- CV_CPP := 4.3.0-$(REL_NO_430)
- CV_GCC := 4.3.0-$(REL_NO_430)
- CV_GPP := 4.3.0-$(REL_NO_430)
- CV_GOBJC := 4.3.0-$(REL_NO_430)
- CV_GOBJCXX := 4.3.0-$(REL_NO_430)
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha))
+ CV_CPP := 4.2.3-$(REL_NO_423)
+ CV_GCC := 4.2.3-$(REL_NO_423)
+ CV_GPP := 4.2.3-$(REL_NO_423)
+ CV_GOBJC := 4.2.3-$(REL_NO_423)
+ CV_GOBJCXX := 4.2.3-$(REL_NO_423)
endif
REQV_CHILL = $(REQV_295)
REQV_GPC = $(REQV_34)
-REQV_CPP = $(REQV_42)
-REQV_GCC = $(REQV_42)
-REQV_GPP = $(REQV_42)
-REQV_GOBJC = $(REQV_42)
-REQV_GOBJCXX = $(REQV_42)
+REQV_CPP = $(REQV_43)
+REQV_GCC = $(REQV_43)
+REQV_GPP = $(REQV_43)
+REQV_GOBJC = $(REQV_43)
+REQV_GOBJCXX = $(REQV_43)
REQV_GFORT = $(REQV_43)
REQV_GCJ = $(REQV_43)
REQV_GIJ = $(REQV_43)
@@ -148,12 +152,12 @@ REQV_GDC = $(REQV_41_GDC)
REQV_GNAT = $(REQV_43)
REQV_SPU = $(REQV_43)
-ifeq (,$(filter $(DEB_HOST_ARCH), alpha amd64 i386))
- REQV_CPP = $(REQV_43)
- REQV_GCC = $(REQV_43)
- REQV_GPP = $(REQV_43)
- REQV_GOBJC = $(REQV_43)
- REQV_GOBJCXX= $(REQV_43)
+ifneq (,$(filter $(DEB_HOST_ARCH), alpha))
+ REQV_CPP = $(REQV_42)
+ REQV_GCC = $(REQV_42)
+ REQV_GPP = $(REQV_42)
+ REQV_GOBJC = $(REQV_42)
+ REQV_GOBJCXX= $(REQV_42)
endif
EPOCH=4
--
1.5.5.GIT
signature.asc
Description: Digital signature
