From: Kito Date: Sun, 26 Mar 2006 01:58:55 +0000 (-0000) Subject: remove unneeded arch diff cruft X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c77a0a210370224798f885c42d1b820dc3c1982b;p=portage.git remove unneeded arch diff cruft svn path=/main/branches/prefix/; revision=3009 --- diff --git a/cnf/Makefile.in b/cnf/Makefile.in index 3acca71c9..e0543317f 100644 --- a/cnf/Makefile.in +++ b/cnf/Makefile.in @@ -24,19 +24,10 @@ all: install: $(INSTALL) -d -m 755 -o $(portageuser) -g $(portagegroup) $(DESTDIR)$(sysconfdir) - @ if [ -f $(srcdir)/make.conf.$(ARCH).diff ] \ - ; then echo "$(INSTALL_cnfsubst) $(srcdir)/make.globals.$(ARCH) $(DESTDIR)$(sysconfdir)/make.globals" \ - ; $(INSTALL_cnfsubst) $(srcdir)/make.globals.$(ARCH) $(DESTDIR)$(sysconfdir)/make.globals \ - ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.conf.$(ARCH) $(DESTDIR)$(sysconfdir)/make.conf.example" \ - ; $(INSTALL_cnfsubst) $(srcdir)/make.conf.$(ARCH) $(DESTDIR)$(sysconfdir)/make.conf.example \ - ; else echo "" \ - ; echo "Portage does not have an arch-specific configuration for this arch." \ - ; echo "Please notify the arch maintainer about this issue. Using generic." \ - ; echo "" \ - ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals" \ - ; $(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals \ - ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example" \ - ; $(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example \ + ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals" \ + ; $(INSTALL_cnfsubst) $(srcdir)/make.globals $(DESTDIR)$(sysconfdir)/make.globals \ + ; echo "$(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example" \ + ; $(INSTALL_cnfsubst) $(srcdir)/make.conf $(DESTDIR)$(sysconfdir)/make.conf.example \ ; fi @ for p in etc-update dispatch-conf \ ; do echo "$(INSTALL_cnfsubst) $(srcdir)/$${p}.conf $(DESTDIR)$(sysconfdir)/$${p}.conf" \ diff --git a/cnf/make.conf b/cnf/make.conf index d993464ca..37e2603eb 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -70,15 +70,19 @@ # system usage. If you change any of these, be sure it is available when # you try to use portage. *** DO NOT INCLUDE A TRAILING "/" *** # +# EPREFIX is the filesystem location in which ALL packages will be +# installed to. +#EPREFIX=/opt/gentoo +# # PORTAGE_TMPDIR is the location portage will use for compilations and # temporary storage of data. This can get VERY large depending upon # the application being installed. -#PORTAGE_TMPDIR=/var/tmp +#PORTAGE_TMPDIR="${EPREFIX}"/var/tmp # # PORTDIR is the location of the portage tree. This is the repository # for all profile information as well as all ebuilds. If you change # this, you must update your /etc/make.profile symlink accordingly. -#PORTDIR=/usr/portage +#PORTDIR="${EPREFIX}"/usr/portage # # DISTDIR is where all of the source code tarballs will be placed for # emerges. The source code is maintained here unless you delete @@ -98,7 +102,7 @@ # providing a directory. Permissions will be modified as needed IF the # directory exists, otherwise logging will be disabled. NNNN is the # increment at the time the log is created. Logs are thus sequential. -#PORT_LOGDIR=/var/log/portage +#PORT_LOGDIR="${EPREFIX}"/var/log/portage # # PORTDIR_OVERLAY is a directory where local ebuilds may be stored without # concern that they will be deleted by rsync updates. Default is not @@ -124,9 +128,13 @@ #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}" # +# curl groks urls +#FETCHCOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}" +#RESUMECOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE} \${URI}" +# # Lukemftp (BSD ftp): -#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}" -#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}" +#FETCHCOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}" +#RESUMECOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}" # # Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval. # The list is a space separated list which is read left to right. If you use diff --git a/cnf/make.conf.alpha.diff b/cnf/make.conf.alpha.diff deleted file mode 100644 index 5fa4ae30b..000000000 --- a/cnf/make.conf.alpha.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index 397e8cb36..000000000 --- a/cnf/make.conf.amd64.diff +++ /dev/null @@ -1,61 +0,0 @@ ---- 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 deleted file mode 100644 index 6c1e7f173..000000000 --- a/cnf/make.conf.arm.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index a3d0147be..000000000 --- a/cnf/make.conf.hppa.diff +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 deleted file mode 100644 index a6127077a..000000000 --- a/cnf/make.conf.ia64.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 deleted file mode 100644 index 1ee10ec7b..000000000 --- a/cnf/make.conf.mips.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- 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-macos b/cnf/make.conf.ppc-macos deleted file mode 100644 index 48bb7237d..000000000 --- a/cnf/make.conf.ppc-macos +++ /dev/null @@ -1,375 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.57.2.4 2005/04/13 15:28:38 jstubbs Exp $ -# Contains local system settings for Portage system - -# Please review 'man make.conf' for more information. - -# Build-time functionality -# ======================== -# -# The USE variable is used to enable optional build-time functionality. For -# example, quite a few packages have optional X, gtk or GNOME functionality -# that can only be enabled or disabled at compile-time. Gentoo Linux has a -# very extensive set of USE variables described in our USE variable HOWTO at -# http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=2&chap=1 -# -# The available list of use flags with descriptions is in your portage tree. -# Use 'less' to view them: --> less /usr/portage/profiles/use.desc <-- -# -# 'ufed' is an ncurses/dialog interface available in portage to make handling -# useflags for you. 'emerge app-portage/ufed' -# -# Example: -#USE="X gtk gnome -alsa" - -# Host Setting -# ============ -# -# All OS X 10.4 (Tiger) PowerPC systems should use this host setting: - -CHOST="powerpc-apple-darwin8" - -# 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. -# -# -mtune= 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. -# -# Recommended settings for Apple GCC 4 only : -# -# -faltivec 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 -# -# The following is the suggested CFLAGS for a generic G4 cpu -# -#CFLAGS="-O3 -pipe -mtune=G4 -faltivec" -# -## The following is the suggested CFLAGS for a generic G5 cpu -# -#CFLAGS="-O3 -pipe -mtune=G5 -faltivec" -# -# All non G4/G5 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 -mtune=G3 -fno-strict-aliasing" - -# If you set a CFLAGS above, then this line will set your default C++ flags to -# the same settings. -#CXXFLAGS="${CFLAGS}" - -# Advanced Masking -# ================ -# -# Gentoo is using a new masking system to allow for easier stability testing -# on packages. KEYWORDS are used in ebuilds to mask and unmask packages based -# on the platform they are set for. A special form has been added that -# indicates packages and revisions that are expected to work, but have not yet -# been approved for the stable set. '~arch' is a superset of 'arch' which -# includes the unstable, in testing, packages. Users of the 'x86' architecture -# would add '~x86' to ACCEPT_KEYWORDS to enable unstable/testing packages. -# '~ppc', '~sparc' are the unstable KEYWORDS for their respective platforms. -# -# Please note that this is not for development, alpha, beta, nor cvs release -# packages. "Broken" packages will not be added to testing and should not be -# requested to be added. Alternative routes are available to developers -# for experimental packages, and it is at their discretion to use them. -# -# 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. -# -# 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-macos" - -# Portage Directories -# =================== -# -# Each of these settings controls an aspect of portage's storage and file -# system usage. If you change any of these, be sure it is available when -# you try to use portage. *** DO NOT INCLUDE A TRAILING "/" *** -# -# PREFIX is the location that ALL packages will be merged to. -PREFIX=/Library/Gentoo -# PORTAGE_TMPDIR is the location portage will use for compilations and -# temporary storage of data. This can get VERY large depending upon -# the application being installed. -PORTAGE_TMPDIR="${EPREFIX}/var/tmp" -# -# PORTDIR is the location of the portage tree. This is the repository -# for all profile information as well as all ebuilds. If you change -# this, you must update your ${EPREFIX}"/etc/make.profile symlink -# accordingly. -PORTDIR="${EPREFIX}/usr/portage" -# -# DISTDIR is where all of the source code tarballs will be placed for -# emerges. The source code is maintained here unless you delete -# it. The entire repository of tarballs for gentoo is 9G. This is -# considerably more than any user will ever download. 2-3G is -# a large DISTDIR. -#DISTDIR=${PORTDIR}/distfiles -# -# PKGDIR is the location of binary packages that you can have created -# with '--buildpkg' or '-b' while emerging a package. This can get -# upto several hundred megs, or even a few gigs. -#PKGDIR=${PORTDIR}/packages -# -# PORT_LOGDIR is the location where portage will store all the logs it -# creates from each individual merge. They are stored as NNNN-$PF.log -# in the directory specified. This is disabled until you enable it by -# providing a directory. Permissions will be modified as needed IF the -# directory exists, otherwise logging will be disabled. NNNN is the -# increment at the time the log is created. Logs are thus sequential. -PORT_LOGDIR="${EPREFIX}/var/log/portage" -# -# PORTDIR_OVERLAY is a directory where local ebuilds may be stored without -# concern that they will be deleted by rsync updates. Default is not -# defined. -PORTDIR_OVERLAY="${EPREFIX}/usr/local/portage" - -# Fetching files -# ============== -# -# If you need to set a proxy for wget or lukemftp, add the appropriate "export -# ftp_proxy=" and "export http_proxy=" lines to /etc/profile if -# all users on your system should use them. -# -# Portage for Mac OS X uses curl by default. Here are some settings for some -# alternate ownloaders -- note that you need to merge these programs first. -# -# curl groks urls -FETCHCOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}" -RESUMECOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE} \${URI}" -# Default wget fetch command (5 tries, passive ftp for firewall compatibility) -#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}" -#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 --passive-ftp \${URI} -P \${DISTDIR}" -# -# Using wget, ratelimiting downloads -#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" -#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}" -# -# Lukemftp (BSD ftp): -#FETCHCOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}" -#RESUMECOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}" -# -# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval. -# The list is a space separated list which is read left to right. If you use -# another mirror we highly recommend leaving the default mirror at the end of -# the list so that portage will fall back to it if the files cannot be found -# on your specified mirror. We _HIGHLY_ recommend that you change this setting -# to a nearby mirror by merging and using the 'mirrorselect' tool. -#GENTOO_MIRRORS=" http://distfiles.gentoo.org http://www.ibiblio.org/pub/Linux/distributions/gentoo" -# -# Portage uses PORTAGE_BINHOST to specify mirrors for prebuilt-binary packages. -# The list is a single entry specifying the full address of the directory -# serving the tbz2's for your system. Running emerge with either '--getbinpkg' -# or '--getbinpkgonly' will cause portage to retrieve the metadata from all -# packages in the directory specified, and use that data to determine what will -# be downloaded and merged. '-g' or '-gK' are the recommend parameters. Please -# consult the man pages and 'emerge --help' for more information. For FTP, the -# default connection is passive -- If you require an active connection, affix -# an asterisk (*) to the end of the host:port string before the path. -#PORTAGE_BINHOST="http://grp.mirror.site/gentoo/grp/1.4/i686/athlon-xp/" -# This ftp connection is passive ftp. -#PORTAGE_BINHOST="ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon-xp/" -# This ftp connection is active ftp. -#PORTAGE_BINHOST="ftp://login:pass@grp.mirror.site:21*/pub/grp/i686/athlon-xp/" - -# Synchronizing Portage -# ===================== -# -# Each of these settings affects how Gentoo synchronizes your Portage tree. -# 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. -# Please do not single out specific rsync mirrors. Doing so places undue -# stress on particular mirrors. Instead you may use one of the following -# continent specific rotations: -# -# Default: "rsync://rsync.gentoo.org/gentoo-portage" -# North America: "rsync://rsync.namerica.gentoo.org/gentoo-portage" -# South America: "rsync://rsync.samerica.gentoo.org/gentoo-portage" -# Europe: "rsync://rsync.europe.gentoo.org/gentoo-portage" -# Asia: "rsync://rsync.asia.gentoo.org/gentoo-portage" -# Australia: "rsync://rsync.au.gentoo.org/gentoo-portage" -#SYNC="rsync://rsync.gentoo.org/gentoo-portage" -# -# RSYNC_RETRIES sets the number of times portage will attempt to retrieve -# a current portage tree before it exits with an error. This allows -# for a more successful retrieval without user intervention most times. -#RSYNC_RETRIES="3" -# -# RSYNC_TIMEOUT sets the length of time rsync will wait before it times out -# on a connection. Most users will benefit from this setting as it will -# reduce the amount of 'dead air' they experience when they run across -# the occasional, unreachable mirror. Dialup users might want to set this -# value up around the 300 second mark. -#RSYNC_TIMEOUT=180 - -# Advanced Features -# ================= -# -# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are -# specified on every run. Useful options include --ask, --verbose, -# --usepkg and many others. Options that are not useful, such as --help, -# are not filtered. -#EMERGE_DEFAULT_OPTS="" -# -# 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 -# for parallel makes is CPUs+1. -#MAKEOPTS="-j2" -# -# PORTAGE_NICENESS provides a default increment to emerge's niceness level. -# Note: This is an increment. Running emerge in a niced environment will -# reduce it further. Default is unset. -#PORTAGE_NICENESS=3 -# -# AUTOCLEAN enables portage to automatically clean out older or overlapping -# 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. -#AUTOCLEAN="yes" -# -# PORTAGE_TMPFS is a location where portage may create temporary files. -# If specified, portage will use this directory whenever possible -# for all rapid operations such as lockfiles and transient data. -# It is _highly_ recommended that this be a tmpfs or ramdisk. Do not -# set this to anything that does not give a significant performance -# enhancement and proper FS compliance for locks and read/write. -# /dev/shm is a glibc mandated tmpfs, and should be a reasonable -# setting for all linux kernel+glibc based systems. -#PORTAGE_TMPFS="/dev/shm" -# -# FEATURES are settings that affect the functionality of portage. Most of -# 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. -# 'buildpkg' causes binary packages to be created of all packages that -# are being merged. -# 'ccache' enables ccache support via CC. -# 'collision-protect' -# prevents packages from overwriting files that are owned by -# another package or by no package at all. -# '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. -# '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 -# after crashes: /usr/lib/portage/bin/clean_locks. -# 'fixpackages' allows portage to fix binary packages that are stored in -# PKGDIR. This can consume a lot of time. 'fixpackages' is -# also a script that can be run at any given time to force -# the same actions. -# 'gpg' enables basic verification of Manifest files using gpg. -# This features is UNDER DEVELOPMENT and reacts to features -# of strict and severe. Heavy use of gpg sigs is coming. -# '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 -# of it. Some packages support this automaticaly via makefiles. -# 'noauto' causes ebuild to perform only the action requested and -# not any other required actions like clean or unpack -- for -# debugging purposes only. -# 'noclean' prevents portage from removing the source and temporary files -# after a merge -- for debugging purposes only. -# 'nostrip' prevents the stripping of binaries. -# 'notitles' disables xterm titlebar updates (which contain status info). -# '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. -# '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="-autoaddcvs -sandbox -sfperms -userpriv -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. -# Portage will set the default ccache dir if it is not present in the -# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache -# (${EPREFIX}/var/tmp/ccache), and for regular use the default is /root/.ccache. -# Sizes are specified with 'G' 'M' or 'K'. -# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G). -#CCACHE_SIZE="512M" -# -# 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=${EPREFIX}/etc/portage/rsync_excludes - -# logging related variables: -# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are: -# info, warn, error, log -# Warning: commenting this will disable elog -PORTAGE_ELOG_CLASSES="warn error log" - -# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules -# included in portage are (empty means logging is disabled): -# save (saves one log per package in $PORTAGE_TMPDIR/elogs) -# custom (passes all messages to $PORTAGE_LOG_COMMAND) -# syslog (sends all messages to syslog) -# mail (send all messages to the mailserver defined -# in $PORTAGE_LOG_MAILURI) -# To use elog you should enable at least one module -#PORTAGE_ELOG_SYSTEM="save mail" - -# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command -# to process log messages. Two variables are expanded: -# ${PACKAGE} - expands to the cpv entry of the processed -# 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_MAILURI: this variable holds all important settings for the mail -# module. In most cases listing the recipient address and -# the receiving mailserver should be sufficient, but you can -# also use advanced settings like authentication or TLS. The -# full syntax is: -# address [[user:passwd@]mailserver[:port]] -# where -# address: recipient adress -# 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) -# 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) -#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain) -#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;) diff --git a/cnf/make.conf.ppc.diff b/cnf/make.conf.ppc.diff deleted file mode 100644 index f01a2da3c..000000000 --- a/cnf/make.conf.ppc.diff +++ /dev/null @@ -1,87 +0,0 @@ ---- 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 deleted file mode 100644 index fa3f20d0a..000000000 --- a/cnf/make.conf.ppc64.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- 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. -+# -mtarget= 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 -mtarget= 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 -mtarget=970 -maltivec -mabi=altivec" -+# -+#or -+# -+#CFLAGS="-O2 -pipe -mcpu=power3 -mtarget=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 deleted file mode 100644 index b2514d585..000000000 --- a/cnf/make.conf.s390.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- 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.sparc.diff b/cnf/make.conf.sparc.diff deleted file mode 100644 index 68c442829..000000000 --- a/cnf/make.conf.sparc.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- 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 deleted file mode 100644 index b469e3447..000000000 --- a/cnf/make.conf.x86-fbsd.diff +++ /dev/null @@ -1,73 +0,0 @@ ---- 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= 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 deleted file mode 100644 index 39a2bb13c..000000000 --- a/cnf/make.conf.x86.diff +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 - # =================== diff --git a/make.conf-repatch.sh b/make.conf-repatch.sh deleted file mode 100644 index 6589e6b62..000000000 --- a/make.conf-repatch.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -die() { - echo "ERROR: $*" > /dev/stderr - patch -p0 make.conf < make.conf.diff - exit 1 -} - -if [ ! -f "make.conf" -o ! -f "make.conf.x86.diff" -o ! -d ".svn" ]; then - echo "ERROR: current directory is invalid" > /dev/stderr - exit 1 -fi - -svn diff make.conf > make.conf.diff -svn revert make.conf - -for x in make.conf.*.diff; do - archs="$archs $(basename ${x:10} .diff)" -done - - -for arch in $archs; do - echo "* Patching $arch" - cp make.conf make.conf.$arch || die "copy failed" - patch -p0 make.conf.$arch < make.conf.${arch}.diff > /dev/null || die "arch-patch failed" - patch -p0 make.conf.$arch < make.conf.diff > /dev/null || die "patch failed" -done - -echo "* Re-patching make.conf" -patch -p0 make.conf < make.conf.diff > /dev/null || die "repatch failed" - -for arch in $archs; do - echo "* Creating diff for $arch" - diff -u make.conf make.conf.$arch > make.conf.${arch}.diff - [ -z "${KEEP_ARCH_MAKE_CONF}" ] && rm -f make.conf.$arch make.conf.${arch}.orig -done - -rm make.conf.diff - -echo "Done" \ No newline at end of file