[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#670821: gcc-4.6: build system treats systems that identify themselves as wheezy differently from systems that identify themselves as sid



Package: gcc-4.6
Version: 4.6.3-1
Severity: important
Tags: patch

While working on an unofficial "hardfloat for pi" port of debian I discovered that building the gcc-4.6 package in an environment that identifies itself (though lsb-release) as wheezy results in the build choosing different options from building the package in an environment that identifies itself as sid. This leaves a nasty surprise for anyone who rebuilds gcc in wheezy.

Patch is attatched.
--- gcc-4.6-4.6.3-rpi/debian/rules.defs	2012-04-28 01:03:49.000000000 +0000
+++ gcc-4.6-4.6.3-rpi.new/debian/rules.defs	2012-04-28 01:45:39.000000000 +0000
@@ -993,7 +993,7 @@
 # multilib
 biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el
-ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid))
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy sid dapper hardy jaunty karmic lucid))
   biarch_map := $(subst i686=,i486=,$(biarch_map))
 endif
 ifeq ($(distribution),Ubuntu)
--- gcc-4.6-4.6.3-rpi/debian/rules.patch	2012-04-28 01:03:49.000000000 +0000
+++ gcc-4.6-4.6.3-rpi.new/debian/rules.patch	2012-04-28 01:46:11.000000000 +0000
@@ -297,7 +297,7 @@
 ifeq (,$(filter $(distrelease),lenny squeeze dapper hardy intrepid jaunty karmic lucid maverick))
   debian_patches += gcc-no-add-needed
 endif
-ifeq (,$(filter $(distrelease),lenny squeeze sid experimental dapper hardy intrepid jaunty karmic lucid maverick))
+ifeq (,$(filter $(distrelease),lenny squeeze wheezy sid experimental dapper hardy intrepid jaunty karmic lucid maverick))
   debian_patches += gcc-as-needed
 endif
 debian_patches += mips-fix-loongson2f-nop

Reply to: