From 1f6d8563c10489ccfd86931be329bcd603d04366 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 14 Oct 2006 14:29:32 +0000 Subject: [PATCH] Manual sync with trunk, seems this wasn't synced properly once in the past. svn path=/main/branches/prefix/; revision=4689 --- cnf/etc-update.conf | 2 +- cnf/make.conf | 65 ++++++++++++++++----------- cnf/make.conf.alpha.diff | 50 +++++++++++++++++++++ cnf/make.conf.amd64.diff | 61 ++++++++++++++++++++++++++ cnf/make.conf.arm.diff | 50 +++++++++++++++++++++ cnf/make.conf.hppa.diff | 71 ++++++++++++++++++++++++++++++ cnf/make.conf.ia64.diff | 40 +++++++++++++++++ cnf/make.conf.mips.diff | 43 ++++++++++++++++++ cnf/make.conf.ppc.diff | 87 +++++++++++++++++++++++++++++++++++++ cnf/make.conf.ppc64.diff | 69 +++++++++++++++++++++++++++++ cnf/make.conf.s390.diff | 40 +++++++++++++++++ cnf/make.conf.sh.diff | 43 ++++++++++++++++++ cnf/make.conf.sparc.diff | 66 ++++++++++++++++++++++++++++ cnf/make.conf.x86-fbsd.diff | 74 +++++++++++++++++++++++++++++++ cnf/make.conf.x86.diff | 64 +++++++++++++++++++++++++++ 15 files changed, 799 insertions(+), 26 deletions(-) create mode 100644 cnf/make.conf.alpha.diff create mode 100644 cnf/make.conf.amd64.diff create mode 100644 cnf/make.conf.arm.diff create mode 100644 cnf/make.conf.hppa.diff create mode 100644 cnf/make.conf.ia64.diff create mode 100644 cnf/make.conf.mips.diff create mode 100644 cnf/make.conf.ppc.diff create mode 100644 cnf/make.conf.ppc64.diff create mode 100644 cnf/make.conf.s390.diff create mode 100644 cnf/make.conf.sh.diff create mode 100644 cnf/make.conf.sparc.diff create mode 100644 cnf/make.conf.x86-fbsd.diff create mode 100644 cnf/make.conf.x86.diff diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index 647af1270..16ae9334c 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -1,5 +1,5 @@ # edit the lines below to your liking -# $Id: /var/cvsroot/gentoo-src/portage/cnf/etc-update.conf,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ +# $Id: etc-update.conf 3483 2006-06-10 21:40:40Z genone $ # mode - 0 for text, 1 for menu (support incomplete) # note that you need dev-util/dialog installed diff --git a/cnf/make.conf b/cnf/make.conf index d7f22c4a3..39b58d3ce 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84.2.5 2005/04/13 15:28:38 jstubbs Exp $ +# $Id: make.conf 4618 2006-10-08 18:21:05Z zmedico $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -121,12 +121,12 @@ # will be available. # # Default fetch command (5 tries, passive ftp for firewall compatibility) -#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}" -#RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp \${URI} -P \${DISTDIR}" +#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}" +#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}" # # Using wget, ratelimiting downloads -#FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" -#RESUMECOMMAND="/usr/bin/wget -c -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" +#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" +#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" # # curl groks urls #FETCHCOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}" @@ -166,7 +166,6 @@ # Synchronization is handled by rsync and these settings allow some control # over how it is done. # -# # SYNC is the server used by rsync to retrieve a localized rsync mirror # rotation. This allows you to select servers that are geographically # close to you, yet still distribute the load over a number of servers. @@ -180,6 +179,13 @@ # Europe: "rsync://rsync.europe.gentoo.org/gentoo-portage" # Asia: "rsync://rsync.asia.gentoo.org/gentoo-portage" # Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" +# +# If you have multiple Gentoo boxes, it is probably a good idea to have only +# one of them sync from the rotations above. The other boxes can then rsync +# from the local rsync server, reducing the load on the mirrors. +# Instructions for setting up a local rsync server are available here: +# http://www.gentoo.org/doc/en/rsync.xml +# #SYNC="rsync://rsync.gentoo.org/gentoo-portage" # # PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve @@ -202,6 +208,11 @@ # are not filtered. #EMERGE_DEFAULT_OPTS="" # +# INSTALL_MASK allows certain files to not be installed into your file system. +# This is useful when you wish to filter out a certain set of files from +# ever being installed, such as INSTALL.gz or TODO.gz +#INSTALL_MASK="" +# # MAKEOPTS provides extra options that may be passed to 'make' when a # program is compiled. Presently the only use is for specifying # the number of parallel makes (-j) to perform. The suggested number @@ -217,6 +228,9 @@ # packages from the system after every successful merge. This is the # same as running 'emerge -c' after every merge. Set with: "yes" or "no". # This does not affect the unpacked source. See 'noclean' below. +# +# Warning: AUTOCLEAN="no" can cause serious problems due to overlapping +# packages. Do not use it unless absolutely necessary! #AUTOCLEAN="yes" # # PORTAGE_TMPFS is a location where portage may create temporary files. @@ -233,9 +247,11 @@ # these settings are for developer use, but some are available to non- # developers as well. # -# 'autoaddcvs' causes portage to automatically try to add files to cvs -# that will have to be added later. Done at generation times -# and only has an effect when 'cvs' is also set. +# 'assume-digests' +# when commiting work to cvs with repoman(1), assume that all +# existing SRC_URI digests are correct. This feature also +# affects digest generation via ebuild(1) and emerge(1) (emerge +# generates digests only when the 'digest' feature is enabled). # 'buildpkg' causes binary packages to be created of all packages that # are being merged. # 'ccache' enables ccache support via CC. @@ -247,7 +263,10 @@ # 'cvs' causes portage to enable all cvs features (commits, adds), # and to apply all USE flags in SRC_URI for digests -- for # developers only. -# 'digest' causes digests to be generated for all packages being merged. +# 'digest' autogenerate digests for packages when running the emerge(1) +# command. If the 'assume-digests' feature is also enabled then +# existing SRC_URI digests will be reused whenever they are +# available. # 'distcc' enables distcc support via CC. # 'distlocks' enables distfiles locking using fcntl or hardlinks. This # is enabled by default. Tools exist to help clean the locks @@ -262,7 +281,7 @@ # 'keeptemp' prevents the clean phase from deleting the temp files ($T) # from a merge. # 'keepwork' prevents the clean phase from deleting the WORKDIR. -# 'test' causes ebuilds to perform testing phases if they are capable +# 'test' causes ebuilds to perform testing phases if they are capable # of it. Some packages support this automaticaly via makefiles. # 'metadata-transfer' # automatically perform a metadata transfer when `emerge --sync` @@ -279,12 +298,14 @@ # 'sandbox' enables sandboxing when running emerge and ebuild. # 'strict' causes portage to react strongly to conditions that are # potentially dangerous, like missing/incorrect Manifest files. +# 'userfetch' when portage is run as root, drop privileges to +# portage:portage during the fetching of package sources. # 'userpriv' allows portage to drop root privileges while it is compiling, # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" -#FEATURES="sandbox ccache distcc distlocks autoaddcvs" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork" +#FEATURES="sandbox ccache distcc distlocks" # # CCACHE_SIZE sets the space use limitations for ccache. The default size is # 2G, and will be set if not defined otherwise and ccache is in features. @@ -297,13 +318,6 @@ # # DISTCC_DIR sets the temporary space used by distcc. #DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc" -# -# RSYNC_EXCLUDEFROM is a file that portage will pass to rsync when it updates -# the portage tree. Specific chunks of the tree may be excluded from -# consideration. This may cause dependency failures if you are not careful. -# The file format is one pattern per line, blanks and ';' or '#' lines are -# comments. See 'man rsync' for more details on the exclude-from format. -#RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes # logging related variables: # PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are: @@ -315,10 +329,10 @@ PORTAGE_ELOG_CLASSES="warn error log" # included in portage are (empty means logging is disabled): # save (saves one log per package in $PORT_LOGDIR/elog, # /var/log/portage/elog if $PORT_LOGDIR is unset) -# custom (passes all messages to $PORTAGE_LOG_COMMAND) +# custom (passes all messages to $PORTAGE_ELOG_COMMAND) # syslog (sends all messages to syslog) # mail (send all messages to the mailserver defined -# in $PORTAGE_LOG_MAILURI) +# in $PORTAGE_ELOG_MAILURI) # To use elog you should enable at least one module #PORTAGE_ELOG_SYSTEM="save mail" @@ -328,7 +342,7 @@ PORTAGE_ELOG_CLASSES="warn error log" # package (see $PVR in ebuild(5)) # ${LOGFILE} - absolute path to the logfile # Both variables have to be quoted with single quotes -#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p '${PACKAGE}' -f '${LOGFILE}'" +#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p '\${PACKAGE}' -f '\${LOGFILE}'" # PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail # module. In most cases listing the recipient address and @@ -337,10 +351,11 @@ PORTAGE_ELOG_CLASSES="warn error log" # full syntax is: # address [[user:passwd@]mailserver[:port]] # where -# address: recipient address +# address: recipient address # user: username for smtp auth (defaults to none) # passwd: password for smtp auth (defaults to none) # mailserver: smtp server that should be used to deliver the mail (defaults to localhost) +# alternatively this can also be a the path to a sendmail binary if you don't want to use smtp # port: port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000)) # Examples: #PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting) @@ -356,4 +371,4 @@ PORTAGE_ELOG_CLASSES="warn error log" # variables are exanded: # ${PACKAGE} - see description of PORTAGE_ELOG_COMMAND # ${HOST} - FQDN of the host portage is running on -#PORTAGE_ELOG_MAILSUBJECT="package ${PACKAGE} merged on ${HOST} with notice" +#PORTAGE_ELOG_MAILSUBJECT="package \${PACKAGE} merged on \${HOST} with notice" diff --git a/cnf/make.conf.alpha.diff b/cnf/make.conf.alpha.diff new file mode 100644 index 000000000..5fa4ae30b --- /dev/null +++ b/cnf/make.conf.alpha.diff @@ -0,0 +1,50 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.alpha 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,17 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! ++# The generic HOST setting on alpha is alpha-unknown-linux-gnu. If your machine ++# is an ev6 or ev67 based system you might want to use ++# either alphaev6-unknown-linux-gnu or alphaev67-unknown-linux-gnu accordingly. ++# ++#CHOST="alphaev67-unknown-linux-gnu" ++CHOST="alpha-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +44,18 @@ + # 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. ++# -mcpu= means optimize code for the particular type of CPU. In ++# difference to x86 for example -mcpu does break compatibility ++# to older cpu types in case of ev6 or higher. ++# On Alpha there is no -march= option in gcc-3. + # +-#CFLAGS="-O2 -pipe" ++# CPU types supported in gcc-3.2 or higher: ev4, ev45, ev5, ev56, ev6, ev67 + # ++# Decent examples: ++# ++#CFLAGS="-mcpu=ev67 -O3 -pipe " ++CFLAGS="-mcpu=ev5 -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="~alpha" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.amd64.diff b/cnf/make.conf.amd64.diff new file mode 100644 index 000000000..397e8cb36 --- /dev/null +++ b/cnf/make.conf.amd64.diff @@ -0,0 +1,61 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.amd64 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,11 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++CHOST="x86_64-pc-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +38,35 @@ + # 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. ++# -mcpu= means optimize code for the particular type of CPU without ++# breaking compatibility with other CPUs. GCC 3.4 has deprecated support for ++# -mcpu, so use -mtune instead if using this compiler. ++# ++# -march= 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. ++# ++# amd64 CPU types supported in gcc-3.4: athlon64, opteron, k8 ++# ++# 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. # ++# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4. # ++# ************************************************************************* # + # +-#CFLAGS="-O2 -pipe" ++# Decent examples: + # ++#CFLAGS="-mtune=k8 -O2 -pipe" ++#CFLAGS="-march=athlon64 -O2 -pipe" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" +@@ -61,7 +91,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="~amd64" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.arm.diff b/cnf/make.conf.arm.diff new file mode 100644 index 000000000..6c1e7f173 --- /dev/null +++ b/cnf/make.conf.arm.diff @@ -0,0 +1,50 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.arm 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,19 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! ++# It's very important you select the right CHOST from the start. A wrong ++# CHOST could easily lead to weird errors either in compiling or running. ++# ++# Netwinder (or any StrongArm110): armv4l-unknown-linux-gnu ++# nslu2: armvbe-unknown-linux-gnu ++# Generic ARM: arm-unknown-linux-gnu ++# ++CHOST="armv4l-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +46,24 @@ + # 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. +-# +-#CFLAGS="-O2 -pipe" ++# -mcpu= means optimize code for the particular type of CPU without ++# breaking compatibility with other CPUs. + # ++# -march= means to take full advantage of the ABI and instructions ++# for the particular CPU; this will break compatibility with older CPUs (for ++# example, -march=xscale code will not run on a StrongARM 11x0, and ++# -march=strongarm110 code will not run on a regular StrongARM). ++# ++# Don't use -O3. Even -O2 may be risky in some cases. ++# ++# For a full listing of supported CPU models, please refer to the GCC website: ++# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/ARM-Options.html ++# ++# Netwinder: ++#CFLAGS="-mcpu=strongarm110 -O2 -pipe" ++# NSLU2: ++#CFLAGS="-mcpu=armeb -O2 -pipe" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" diff --git a/cnf/make.conf.hppa.diff b/cnf/make.conf.hppa.diff new file mode 100644 index 000000000..a3d0147be --- /dev/null +++ b/cnf/make.conf.hppa.diff @@ -0,0 +1,71 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.hppa 2006-03-24 18:36:24.000000000 +0100 +@@ -23,6 +23,18 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! ++# The generic CHOST value for hppa is hppa-unknown-linux-gnu. ++# But you might want to use hppa1.1-unknown-linux-gnu or hppa2.0-unknown-linux-gnu ++# according to your station. ++# ++CHOST="hppa-unknown-linux-gnu" ++#CHOST="hppa1.1-unknown-linux-gnu" ++#CHOST="hppa2.0-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,14 +45,38 @@ + # 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. ++# -march= means to take full advantage of the ABI and instructions ++# for the particular CPU; this will break compatibility with older CPUs (for ++# example, -march=2.0 code will not run on a regular hppa1.1 station) ++# ++# -mschedule=cpu-type create schedule code according to the constraints for the machine ++# cpu-type. The choices for cpu-type are 700 7100, 7100LC, 7200, and 8000. ++# Use 'cat /proc/cpuinfo' to know the right schedule for your hppa. ++# Note that you must use 7100LC for 7300LC. ++# ++# Architectures types supported in gcc-3.2 and higher: 1.0, 1.1 and 2.0 ++# Note that 64bit userspace is not yet implemented. + # +-#CFLAGS="-O2 -pipe" ++# Decent examples: + # ++ ++# Use this one if you have a hppa1.1 ++#CFLAGS="-march=1.1 -O2 -pipe -mschedule=7100LC" ++ ++# Or this one if you have a hppa2.0 ++# Note that -march=2.0 was unstable on some stations. ++# -march=1.0 will create problems too. ++#CFLAGS="-O2 -pipe -mschedule=8000" ++ ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" + ++# Btw it's recommended to use this setting for stability. ++# There are still many bugs with higher level of optimisation. ++#CXXFLAGS="-O1 -pipe" ++ + # Advanced Masking + # ================ + # +@@ -61,7 +97,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="~hppa" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.ia64.diff b/cnf/make.conf.ia64.diff new file mode 100644 index 000000000..a6127077a --- /dev/null +++ b/cnf/make.conf.ia64.diff @@ -0,0 +1,40 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.ia64 2006-03-19 18:26:21.000000000 +0100 +@@ -23,20 +23,18 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# All Itanium systems should use this host setting: ++ ++CHOST="ia64-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +-# For optimal performance, enable a CFLAGS setting appropriate for your CPU. +-# +-# Please note that if you experience strange issues with a package, it may be +-# due to gcc's optimizations interacting in a strange way. Please test the +-# 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. +-# + #CFLAGS="-O2 -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="~ia64" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.mips.diff b/cnf/make.conf.mips.diff new file mode 100644 index 000000000..1ee10ec7b --- /dev/null +++ b/cnf/make.conf.mips.diff @@ -0,0 +1,43 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.mips 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,13 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# All MIPS systems should use this host setting: ++ ++CHOST="mips-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +40,15 @@ + # 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. ++# -mcpu= for MIPS systems selects the type of processor you want ++# to optimize your code for. Code generated under those options will run best ++# on that processor, and may not run at all on others. + # +-#CFLAGS="-O2 -pipe" ++# GCC 3.2 supports many mips processor types including: r2000, r3000, r3900, r4000, ++# r4100, r4300, r4400, r4600, r4650, r5000, r6000, r8000 , orion + # ++#CFLAGS="-O2 -pipe" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" +@@ -61,7 +73,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="~mips" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.ppc.diff b/cnf/make.conf.ppc.diff new file mode 100644 index 000000000..f01a2da3c --- /dev/null +++ b/cnf/make.conf.ppc.diff @@ -0,0 +1,87 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.ppc 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,13 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# All PowerPC systems should use this host setting: ++ ++CHOST="powerpc-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +40,56 @@ + # 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. ++# -mcpu= for PowerPC systems selects the type of processor you want ++# to optimize your code for. Code generated under those options will run best ++# on that processor, and may not run at all on others. ++# ++# GCC 3.4 supports many powerpc processor types including: 401, 403, 405, ++# 405fp, 440, 440fp, 505, 601, 602, 603, 603e, 604, 604e, 620, 630, 740, 7400, ++# 7450, 750, 801, 821, 823, 860, 970, 8540, common, ec603e, G3, G4, G5, power, ++# power2, power3, power4, power5, powerpc, powerpc64, rios, rios1, rios2, rsc, ++# and rs64a ++# ++# Recommended settings for GCC 3.4 only : ++# ++# -maltivec enables optional altivec support and should be used ++# only for G4 processors, on GCC 3.2 or newer. It also requires that you have ++# the alitvec option compiled into your kernel to take full advantage of this ++# feature. Note: you should also include -mabi=altivec flag if using this ++# option. ++# ++# The newer gcc has a stricter aliasing ruleset that makes type punned ++# expression faulty compiled if -fstrict-aliasing is enabled. ++# That option is implied by -O2 -Os and -O3. Make SURE you don't have that ++# option enabled by adding -fno-strict-aliasing to your CFLAGS and CXXFLAGS ++# ++# Long term testing has shown that -O3 opts can be unreliable on G4's but work ++# on G3 series processors or earlier. ++# ++# The following is the suggested CFLAGS for a generic G4 cpu ++# ++#CFLAGS="-O2 -pipe -mcpu=G4 -maltivec -mabi=altivec -fno-strict-aliasing" + # +-#CFLAGS="-O2 -pipe" + # ++# All non G4 PPC boxen should choose this next option. It will work fine for ++# all G3 and pre machines. (note it will not hurt pre G3 machines either to ++# use this mcpu option as it is the default for gcc 3.2.x anyway) ++# ++#CFLAGS="-O3 -pipe -mcpu=G3 -fno-strict-aliasing" ++ ++# Recommended settings for GCC 2.95.3 only (Gentoo 1.2 or older): ++# ++# PowerPC 750 > up: this works on G3's and G4s, gcc 2.95.3 doesn't make the ++# distinction between G3 and G4, so this is fine for all NewWorld machines, if ++# you use yaboot to boot you should select this option ++# ++#CFLAGS="-O2 -pipe -mcpu=750 -mpowerpc-gfxopt -mmultiple -mstring" ++# ++# This will run on all other processors, by building more generic code This is ++# safe for all PPC machines running gcc 2.95.3, and works for all OldWorld ++# machines - if you use BootX to boot you should select this option ++#CFLAGS="-O2 -pipe -mmultiple -mstring" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" +@@ -61,7 +114,10 @@ + # 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" ++# Note: this really shouldn't be enabled until _AFTER_ you bootstrap and emerge ++# system. If you want the testing things update after these steps are completed. ++# ++#ACCEPT_KEYWORDS="~ppc" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.ppc64.diff b/cnf/make.conf.ppc64.diff new file mode 100644 index 000000000..2aaec01f0 --- /dev/null +++ b/cnf/make.conf.ppc64.diff @@ -0,0 +1,69 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.ppc64 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,13 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# All PowerPC64 systems should use this host setting: ++ ++CHOST="powerpc64-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,9 +40,38 @@ + # 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= for PowerPC64 systems instructs the gcc compiler that ++# it can use instruction scheduling specific for that type of processor ++# specified ++# ++# -mcpu= for PowerPC64 systems selects the type of processor you want ++# to optimize your code for. Code generated under those options will run best ++# on that processor. ++# ++# -mcpu= and -mtune= should both be specified ++# ++# GCC 3.x supports many ppc64 processor types including: power3, power4, ++# 970 (aka G5), and power5. ++# ++# RS64 processors should specify power3. ++# ++# Additional options of interest: ++# ++# -maltivec enables optional altivec support and should be used ++# only for 970 processors. It also requires that you have ++# the alitvec option compiled into your kernel to take full advantage of this ++# feature. Note: you should also include -mabi=altivec flag if using this option. + # +-#CFLAGS="-O2 -pipe" ++# -O3 for the most part seems ok but should be used with caution as ++# for instance app-editors/vim has problems if it is used. -O2 is a ++# good selection. ++# ++#Example CFLAGS setting ++#CFLAGS="-O2 -pipe -mcpu=970 -mtune=970 -maltivec -mabi=altivec" ++# ++#or ++# ++#CFLAGS="-O2 -pipe -mcpu=power3 -mtune=power3" + # + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. +@@ -61,7 +97,10 @@ + # 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" ++# Note: this really shouldn't be enabled until _AFTER_ you bootstrap and emerge ++# system. If you want the testing things update after these steps are completed. ++# ++#ACCEPT_KEYWORDS="ppc64" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.s390.diff b/cnf/make.conf.s390.diff new file mode 100644 index 000000000..b2514d585 --- /dev/null +++ b/cnf/make.conf.s390.diff @@ -0,0 +1,40 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.s390 2006-03-19 18:26:21.000000000 +0100 +@@ -23,20 +23,18 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# All s390 systems should use this host setting: ++ ++CHOST="s390-ibm-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +-# For optimal performance, enable a CFLAGS setting appropriate for your CPU. +-# +-# Please note that if you experience strange issues with a package, it may be +-# due to gcc's optimizations interacting in a strange way. Please test the +-# 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. +-# + #CFLAGS="-O2 -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="~s390" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.sh.diff b/cnf/make.conf.sh.diff new file mode 100644 index 000000000..5032c85ee --- /dev/null +++ b/cnf/make.conf.sh.diff @@ -0,0 +1,43 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.sh 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,19 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! ++# It's very important you select the right CHOST from the start. A wrong ++# CHOST could easily lead to weird errors either in compiling or running. ++# ++# There are really only two choices right now: ++# sh3-unknown-linux-gnu ++# sh4-unknown-linux-gnu (Dreamcast / LANTank) ++# ++CHOST="sh4-unknown-linux-gnu" ++ + # Host and optimization settings + # ============================== + # +@@ -33,10 +46,17 @@ + # 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. +-# +-#CFLAGS="-O2 -pipe" ++# -m# optimize code for the particular type of CPU. The number should match ++# your CHOST so if you are using "sh4-unknown-linux-gnu", you should have ++# -m4 below. + # ++# Don't use -O3. Even -O2 may be risky in some cases. ++# ++# For a full listing of supported CPU models, please refer to the GCC website: ++# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/SH-Options.html ++# ++#CFLAGS="-m4 -O2 -pipe" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" diff --git a/cnf/make.conf.sparc.diff b/cnf/make.conf.sparc.diff new file mode 100644 index 000000000..68c442829 --- /dev/null +++ b/cnf/make.conf.sparc.diff @@ -0,0 +1,66 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.sparc 2006-03-19 18:26:21.000000000 +0100 +@@ -23,6 +23,15 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# This should be left to the default value of sparc-unknown-linux-gnu unless ++# you are absolutely certain of the consequences. In addition to potentially ++# destroying your system, you will recieve no support and your bugs will be ++# marked INVALID if you change this. ++# ++# CHOST="sparc-unknown-linux-gnu" ++ + # 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. +-# +-#CFLAGS="-O2 -pipe" +-# ++# Sparc specific cpu optimizatiobn flags can be found here: ++# http://gcc.gnu.org/onlinedocs/gcc-3.3/gcc/SPARC-Options.html#SPARC%20Options ++# ++# -mcpu= means optimize code for the particular type of CPU without ++# breaking compatibility with other CPUs. ++# ++# -mtune= set the instruction scheduling parameters for machine, but ++# do not set the instruction set or register set. ++# ++# Here is a list of each supported architecture and their supported ++# implementations: ++# ++# gcc-3.2 and higher: ++# v7: cypress ++# v8: supersparc, hypersparc ++# sparclite: f930, f934, sparclite86x ++# sparclet: tsc701 ++# v9: ultrasparc ++# ++# Additionally in gcc-3.3 and higher: ++# v9: ultrasparc3 ++# ++# Decent examples: ++# ++#CFLAGS="-mcpu=supersparc -O3 -pipe" ++#CFLAGS="-mcpu=ultrasparc -O3 -pipe" ++#CFLAGS="-mcpu=v8 -mtune=v9 -O2 -pipe" ++ + # If you set a CFLAGS above, then this line will set your default C++ flags to + # the same settings. + #CXXFLAGS="${CFLAGS}" +@@ -61,7 +94,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="~sparc" + + # Portage Directories + # =================== diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff new file mode 100644 index 000000000..6ce2c8090 --- /dev/null +++ b/cnf/make.conf.x86-fbsd.diff @@ -0,0 +1,74 @@ +--- 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,16 @@ + # Example: + #USE="X gtk gnome -alsa" + ++# Host Setting ++# ============ ++# ++# 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. ++# The version number at the end has to correspond to the version of the ++# profile and of freebsd-lib package. ++CHOST="i686-gentoo-freebsd6.1" ++ + # 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= means optimize code for the particular type of CPU without ++# breaking compatibility with other CPUs. ++# ++# -march= 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. diff --git a/cnf/make.conf.x86.diff b/cnf/make.conf.x86.diff new file mode 100644 index 000000000..39a2bb13c --- /dev/null +++ b/cnf/make.conf.x86.diff @@ -0,0 +1,64 @@ +--- make.conf 2006-03-19 18:40:11.000000000 +0100 ++++ make.conf.x86 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-pc-linux-gnu" ++ + # 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. ++# -mcpu= means optimize code for the particular type of CPU without ++# breaking compatibility with other CPUs. + # +-#CFLAGS="-O2 -pipe" ++# -march= 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. # ++# ************************************************************************* # + # ++# Decent examples: ++# ++#CFLAGS="-mcpu=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" + + # Portage Directories + # =================== -- 2.26.2