diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-01 10:19:35 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-01 10:19:35 +0000 |
| commit | 0d631c36dbfb3106596053fc3b83799a2ad8bd38 (patch) | |
| tree | 89aedc3a160d83fae540c3e845cdc03ce17784f7 /conf | |
| parent | 9b6396ef6a65c770d4c12663ab91b85cabbec529 (diff) | |
| parent | 2b295d06eb3d74da6c4ffc1b82c80a1b6c912e3a (diff) | |
merge of 3ca788a65aef8d771564894175d04f8e315091fb
and 6804be27b350307ccfcefb14f7d233e98556f408
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/familiar-0.8.3.conf | 5 | ||||
| -rw-r--r-- | conf/distro/familiar-distro.conf (renamed from conf/distro/familiar.conf) | 0 |
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 7247bdfa53..dc333a3332 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +include conf/distro/familiar-distro.conf DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" @@ -17,6 +17,9 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDER_virtual/libiconv=glibc +PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_x11=diet-x11 # The CSL compiler is unusable because # 1) certain programs stop to compile diff --git a/conf/distro/familiar.conf b/conf/distro/familiar-distro.conf index 497ba6a89c..497ba6a89c 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar-distro.conf |