summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2009-07-09 14:48:38 -0500
committerMike Westerhof <mwester@dls.net>2009-07-09 14:48:38 -0500
commit5e910c56c38255f8d9745d1901e7faa97f918648 (patch)
treef8172db9857cd0f541e4a88aefb0d1e967478121 /conf/distro
parent1277272b839bf6e0209fc8b1aa36f9399fac596b (diff)
SlugOS: slugos.inc - switch from diet-x11 libs to standard x11 libs
(diet-x11 has grown stale, and while the smaller size is good, staying current is preferable as a default.)
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/slugos.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index fb036c10e8..903e5ed602 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -127,9 +127,11 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-SRCDATE_diet-x11 ?= "20060106"
+# Select the appropriate x11 library provider. The diet-x11 libraries are
+# much smaller, but may not be as current as the standard x11 libraries; by
+# default we will select the standard libraries and permit the use of an
+# override if the user wishes (and has the correct PREFERRED_VERSIONs set).
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
# Ensure consistency across all SlugOS builds for the provider of a relational
# database - use the latest version of the SleepyCat Berkeley database