summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-03-24 18:14:00 +0000
committerMarius Mauch <genone@gentoo.org>2006-03-24 18:14:00 +0000
commit47be081dc18f47e8b4955721c3db3812adf475d9 (patch)
tree1a610ba08c828f1c95938afdd4d4a47d2262428b /cnf/make.conf.x86-fbsd.diff
parentCreate tbz2 package directly in ${PKGDIR}/All to avoid need for temp file (in... (diff)
downloadportage-idfetch-47be081dc18f47e8b4955721c3db3812adf475d9.tar.gz
portage-idfetch-47be081dc18f47e8b4955721c3db3812adf475d9.tar.bz2
portage-idfetch-47be081dc18f47e8b4955721c3db3812adf475d9.zip
Replacing arch specific make.conf files with patches for the fallback make.conf which should be applied in the ebuild.
Add a helper script to update patches if the main make.conf is changed. svn path=/main/trunk/; revision=2987
Diffstat (limited to 'cnf/make.conf.x86-fbsd.diff')
-rw-r--r--cnf/make.conf.x86-fbsd.diff73
1 files changed, 73 insertions, 0 deletions
diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
new file mode 100644
index 00000000..b469e344
--- /dev/null
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -0,0 +1,73 @@
+--- 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 @@
+ # 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"
++
+ # Host and optimization settings
+ # ==============================
+ #
+@@ -33,10 +42,34 @@
+ # package (and in some cases the libraries it uses) at default optimizations
+ # before reporting errors to developers.
+ #
+-# Please refer to the GCC manual for a list of possible values.
++# -mtune=<cpu-type> means optimize code for the particular type of CPU without
++# breaking compatibility with other CPUs.
++#
++# -march=<cpu-type> means to take full advantage of the ABI and instructions
++# for the particular CPU; this will break compatibility with older CPUs (for
++# example, -march=athlon-xp code will not run on a regular Athlon, and
++# -march=i686 code will not run on a Pentium Classic.
++#
++# CPU types supported in gcc-3.2 and higher: athlon-xp, athlon-mp,
++# athlon-tbird, athlon, k6, k6-2, k6-3, i386, i486, i586 (Pentium), i686
++# (PentiumPro), pentium, pentium-mmx, pentiumpro, pentium2 (Celeron),
++# pentium3, and pentium4.
++#
++# Note that Gentoo Linux 1.4 and higher include at least gcc-3.2.
++#
++# CPU types supported in gcc-2.95*: k6, i386, i486, i586 (Pentium), i686
++# (Pentium Pro), pentium, pentiumpro Gentoo Linux 1.2 and below use gcc-2.95*
++#
++# CRITICAL WARNINGS: ****************************************************** #
++# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
++# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# ************************************************************************* #
+ #
+-#CFLAGS="-O2 -pipe"
++# Decent examples:
+ #
++#CFLAGS="-mtune=athlon-xp -O3 -pipe"
++#CFLAGS="-march=pentium3 -O3 -pipe"
++
+ # If you set a CFLAGS above, then this line will set your default C++ flags to
+ # the same settings.
+ #CXXFLAGS="${CFLAGS}"
+@@ -61,7 +80,7 @@
+ # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
+ # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
+ #
+-#ACCEPT_KEYWORDS="~arch"
++#ACCEPT_KEYWORDS="~x86-fbsd"
+
+ # Portage Directories
+ # ===================
+@@ -268,7 +289,8 @@
+ # 'notitles' disables xterm titlebar updates (which contain status info).
+ # 'parallel-fetch'
+ # do fetching in parallel to compilation
+-# 'sandbox' enables sandboxing when running emerge and ebuild.
++# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't
++# work on *BSD-based systems.
+ # 'strict' causes portage to react strongly to conditions that are
+ # potentially dangerous, like missing/incorrect Manifest files.