From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 7 Sep 2005 23:11:44 +0000 (+0000)
Subject: gcc-3.4.4, openzaurus-3.5.4: remove DEFAULT_PREFERENCE from gcc bb files and use... 
X-Git-Tag: Release-2010-05/1~9453^2~3595^2^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d29d22276da39a6808ba18d61a6c1e72778066a6;p=openembedded.git

gcc-3.4.4, openzaurus-3.5.4: remove DEFAULT_PREFERENCE from gcc bb files and use PREFERRED_VERSION in openzaurus conf to force use of gcc 3.4.4
---

diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index 7b83dae13b..88822c103d 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -27,6 +27,9 @@ KERNEL_CONSOLE = "ttyS0"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+
 #
 # Base
 #
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 78fc9dde2e..c111ac00b7 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -7,8 +7,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # remember to increment this one too.
 PR = "r1"
 
-DEFAULT_PREFERENCE_arm-linux = "1"
-
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 6c6a3d8276..f4a67b77c2 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -5,8 +5,6 @@ SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
 
-DEFAULT_PREFERENCE_arm-linux = "1"
-
 inherit autotools gettext
 
 include gcc-package.inc