diff options
| author | Justin Patrin <papercrane@gmail.com> | 2005-09-07 23:26:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-07 23:26:21 +0000 |
| commit | c1541e71a1a8dec1db567a9592bf7ad25776fccc (patch) | |
| tree | fd8543f66ecaadaff216234eb0398fb2a8c8ebf8 | |
| parent | 3bd541d01751acee647413bc82ca1467c04210bc (diff) | |
| parent | d29d22276da39a6808ba18d61a6c1e72778066a6 (diff) | |
merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
and a1e17a5d7e46806b4e9ec3ded69b419eed479b4d
| -rw-r--r-- | conf/distro/openzaurus-3.5.4.conf | 3 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross_3.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/gcc/gcc_3.4.4.bb | 2 |
3 files changed, 3 insertions, 4 deletions
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 |