diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-21 13:45:24 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-21 13:45:24 -0800 |
| commit | ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed (patch) | |
| tree | aa3ae63ca70d396addf569e3f259bf6829ff22f9 /cnf | |
| parent | 1de36ad91237651277b9e4b7e0db819efb5e6997 (diff) | |
| download | portage-ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed.tar.gz portage-ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed.tar.bz2 portage-ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed.zip | |
cnf/make.conf: fix ia64 and s390 diffs
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.conf.ia64.diff | 23 | ||||
| -rw-r--r-- | cnf/make.conf.s390.diff | 23 |
2 files changed, 8 insertions, 38 deletions
diff --git a/cnf/make.conf.ia64.diff b/cnf/make.conf.ia64.diff index a6127077a..3b144d78f 100644 --- a/cnf/make.conf.ia64.diff +++ b/cnf/make.conf.ia64.diff @@ -1,6 +1,6 @@ ---- 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 @@ +--- make.conf ++++ make.conf.ia64 +@@ -22,6 +22,13 @@ # Example: #USE="X gtk gnome -alsa" @@ -14,22 +14,7 @@ # 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 @@ +@@ -75,7 +82,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. # diff --git a/cnf/make.conf.s390.diff b/cnf/make.conf.s390.diff index b2514d585..2acb085ba 100644 --- a/cnf/make.conf.s390.diff +++ b/cnf/make.conf.s390.diff @@ -1,6 +1,6 @@ ---- 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 @@ +--- make.conf ++++ make.conf.s390 +@@ -22,6 +22,13 @@ # Example: #USE="X gtk gnome -alsa" @@ -14,22 +14,7 @@ # 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 @@ +@@ -75,7 +82,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. # |