Replacing arch specific make.conf files with patches for the fallback make.conf which should be applied in the ebuild.

Add a helper script to update patches if the main make.conf is changed.


svn path=/main/trunk/; revision=2987

1 files changed, 71 insertions, 0 deletions

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=<cpu-type> means to take full advantage of the ABI and instructions
++# for the particular CPU; this will break compatibility with older CPUs (for
++# example, -march=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
+ # ===================