summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-02 09:32:26 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-02 09:32:26 +0000
commitf9e26804e902fe4566c601cfa4c627317081257c (patch)
tree5b796f9ef2d32c03952bfb75f75c23002aa7548e
parent0e8b9c2d130f99e7d6e832876f6df224596fa854 (diff)
downloadportage-f9e26804e902fe4566c601cfa4c627317081257c.tar.gz
portage-f9e26804e902fe4566c601cfa4c627317081257c.tar.bz2
portage-f9e26804e902fe4566c601cfa4c627317081257c.zip
Update make.conf.example for x86-fbsd with patch from Flameeyes for bug #135241.
svn path=/main/trunk/; revision=3448
-rw-r--r--cnf/make.conf.x86-fbsd.diff9
1 files changed, 5 insertions, 4 deletions
diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
index b469e3447..031576211 100644
--- a/cnf/make.conf.x86-fbsd.diff
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -1,17 +1,18 @@
--- make.conf 2006-03-19 18:40:11.000000000 +0100
+++ make.conf.x86-fbsd 2006-03-19 18:26:21.000000000 +0100
-@@ -23,6 +23,15 @@
+@@ -23,6 +23,16 @@
# Example:
#USE="X gtk gnome -alsa"
+# Host Setting
+# ============
+#
-+# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1!
+# Change this line as appropriate (i686, i586, i486 or i386).
+# All modern systems (even Athlons) should use "i686-pc-linux-gnu".
+# All K6's are i586.
-+CHOST="i686-unknown-freebsd5.3"
++# The version number at the end has to correspond to the version of the
++# profile and of freebsd-lib package.
++CHOST="i686-unknown-freebsd6.1"
+
# Host and optimization settings
# ==============================
@@ -58,7 +59,7 @@
# IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
#
-#ACCEPT_KEYWORDS="~arch"
-+#ACCEPT_KEYWORDS="~x86-fbsd"
++ACCEPT_KEYWORDS="~x86-fbsd"
# Portage Directories
# ===================