Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: cnf/
Date: Wed, 21 Dec 2011 21:45:48
Message-Id: ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed.zmedico@gentoo
1 commit: ca73a3a6e6fe386d90068e0fb5187c395e8ae0ed
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 21 21:45:24 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 21 21:45:24 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca73a3a6
7
8 cnf/make.conf: fix ia64 and s390 diffs
9
10 ---
11 cnf/make.conf.ia64.diff | 23 ++++-------------------
12 cnf/make.conf.s390.diff | 23 ++++-------------------
13 2 files changed, 8 insertions(+), 38 deletions(-)
14
15 diff --git a/cnf/make.conf.ia64.diff b/cnf/make.conf.ia64.diff
16 index a612707..3b144d7 100644
17 --- a/cnf/make.conf.ia64.diff
18 +++ b/cnf/make.conf.ia64.diff
19 @@ -1,6 +1,6 @@
20 ---- make.conf 2006-03-19 18:40:11.000000000 +0100
21 -+++ make.conf.ia64 2006-03-19 18:26:21.000000000 +0100
22 -@@ -23,20 +23,18 @@
23 +--- make.conf
24 ++++ make.conf.ia64
25 +@@ -22,6 +22,13 @@
26 # Example:
27 #USE="X gtk gnome -alsa"
28
29 @@ -14,22 +14,7 @@
30 # Host and optimization settings
31 # ==============================
32 #
33 --# For optimal performance, enable a CFLAGS setting appropriate for your CPU.
34 --#
35 --# Please note that if you experience strange issues with a package, it may be
36 --# due to gcc's optimizations interacting in a strange way. Please test the
37 --# package (and in some cases the libraries it uses) at default optimizations
38 --# before reporting errors to developers.
39 --#
40 --# Please refer to the GCC manual for a list of possible values.
41 --#
42 - #CFLAGS="-O2 -pipe"
43 --#
44 -+
45 - # If you set a CFLAGS above, then this line will set your default C++ flags to
46 - # the same settings.
47 - #CXXFLAGS="${CFLAGS}"
48 -@@ -61,7 +80,7 @@
49 +@@ -75,7 +82,7 @@
50 # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
51 # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
52 #
53
54 diff --git a/cnf/make.conf.s390.diff b/cnf/make.conf.s390.diff
55 index b2514d5..2acb085 100644
56 --- a/cnf/make.conf.s390.diff
57 +++ b/cnf/make.conf.s390.diff
58 @@ -1,6 +1,6 @@
59 ---- make.conf 2006-03-19 18:40:11.000000000 +0100
60 -+++ make.conf.s390 2006-03-19 18:26:21.000000000 +0100
61 -@@ -23,20 +23,18 @@
62 +--- make.conf
63 ++++ make.conf.s390
64 +@@ -22,6 +22,13 @@
65 # Example:
66 #USE="X gtk gnome -alsa"
67
68 @@ -14,22 +14,7 @@
69 # Host and optimization settings
70 # ==============================
71 #
72 --# For optimal performance, enable a CFLAGS setting appropriate for your CPU.
73 --#
74 --# Please note that if you experience strange issues with a package, it may be
75 --# due to gcc's optimizations interacting in a strange way. Please test the
76 --# package (and in some cases the libraries it uses) at default optimizations
77 --# before reporting errors to developers.
78 --#
79 --# Please refer to the GCC manual for a list of possible values.
80 --#
81 - #CFLAGS="-O2 -pipe"
82 --#
83 -+
84 - # If you set a CFLAGS above, then this line will set your default C++ flags to
85 - # the same settings.
86 - #CXXFLAGS="${CFLAGS}"
87 -@@ -61,7 +80,7 @@
88 +@@ -75,7 +82,7 @@
89 # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
90 # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
91 #