commit: 9784eec5e074924b4ee9ccb3e90582d195c6dbdc
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Jan 6 21:58:02 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 22:12:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9784eec5
Update cnf/make.conf.example.${ARCH}.diff patches wrt 98f930d4d
Otherwise they fail to apply, which makes portage-9999 fail at prepare
phase.
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
cnf/make.conf.example.alpha.diff | 2 +-
cnf/make.conf.example.amd64-fbsd.diff | 2 +-
cnf/make.conf.example.amd64.diff | 2 +-
cnf/make.conf.example.arm.diff | 2 +-
cnf/make.conf.example.hppa.diff | 2 +-
cnf/make.conf.example.ia64.diff | 2 +-
cnf/make.conf.example.m68k.diff | 2 +-
cnf/make.conf.example.mips.diff | 2 +-
cnf/make.conf.example.ppc.diff | 2 +-
cnf/make.conf.example.ppc64.diff | 2 +-
cnf/make.conf.example.s390.diff | 2 +-
cnf/make.conf.example.sh.diff | 2 +-
cnf/make.conf.example.sparc-fbsd.diff | 2 +-
cnf/make.conf.example.sparc.diff | 2 +-
cnf/make.conf.example.x86-fbsd.diff | 2 +-
cnf/make.conf.example.x86.diff | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/cnf/make.conf.example.alpha.diff b/cnf/make.conf.example.alpha.diff
index 5306999..83c09ea 100644
--- a/cnf/make.conf.example.alpha.diff
+++ b/cnf/make.conf.example.alpha.diff
@@ -15,7 +15,7 @@
+#CHOST="alphaev67-unknown-linux-gnu"
+CHOST="alpha-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +50,18 @@
diff --git a/cnf/make.conf.example.amd64-fbsd.diff
b/cnf/make.conf.example.amd64-fbsd.diff
index 1277b6d..a02329b 100644
--- a/cnf/make.conf.example.amd64-fbsd.diff
+++ b/cnf/make.conf.example.amd64-fbsd.diff
@@ -9,7 +9,7 @@
+#
+CHOST="x86_64-gentoo-freebsd7.1"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +44,35 @@
diff --git a/cnf/make.conf.example.amd64.diff b/cnf/make.conf.example.amd64.diff
index dfa4b42..8286df6 100644
--- a/cnf/make.conf.example.amd64.diff
+++ b/cnf/make.conf.example.amd64.diff
@@ -9,7 +9,7 @@
+#
+CHOST="x86_64-pc-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +44,35 @@
diff --git a/cnf/make.conf.example.arm.diff b/cnf/make.conf.example.arm.diff
index e52d1bc..200e476 100644
--- a/cnf/make.conf.example.arm.diff
+++ b/cnf/make.conf.example.arm.diff
@@ -17,7 +17,7 @@
+#
+CHOST="armv4l-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +52,22 @@
diff --git a/cnf/make.conf.example.hppa.diff b/cnf/make.conf.example.hppa.diff
index 2d17b37..78db02e 100644
--- a/cnf/make.conf.example.hppa.diff
+++ b/cnf/make.conf.example.hppa.diff
@@ -16,7 +16,7 @@
+#CHOST="hppa1.1-unknown-linux-gnu"
+#CHOST="hppa2.0-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,14 +51,38 @@
diff --git a/cnf/make.conf.example.ia64.diff b/cnf/make.conf.example.ia64.diff
index 68a0cb0..378db8a 100644
--- a/cnf/make.conf.example.ia64.diff
+++ b/cnf/make.conf.example.ia64.diff
@@ -11,7 +11,7 @@
+
+CHOST="ia64-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -76,7 +83,7 @@
diff --git a/cnf/make.conf.example.m68k.diff b/cnf/make.conf.example.m68k.diff
index f967461..7d82b3b 100644
--- a/cnf/make.conf.example.m68k.diff
+++ b/cnf/make.conf.example.m68k.diff
@@ -11,7 +11,7 @@
+#
+CHOST="m68k-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -41,7 +48,7 @@
diff --git a/cnf/make.conf.example.mips.diff b/cnf/make.conf.example.mips.diff
index 7d3d83d..0b521a7 100644
--- a/cnf/make.conf.example.mips.diff
+++ b/cnf/make.conf.example.mips.diff
@@ -11,7 +11,7 @@
+
+CHOST="mips-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +46,15 @@
diff --git a/cnf/make.conf.example.ppc.diff b/cnf/make.conf.example.ppc.diff
index b34de8e..a7ef9cf 100644
--- a/cnf/make.conf.example.ppc.diff
+++ b/cnf/make.conf.example.ppc.diff
@@ -11,7 +11,7 @@
+
+CHOST="powerpc-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +46,56 @@
diff --git a/cnf/make.conf.example.ppc64.diff b/cnf/make.conf.example.ppc64.diff
index 961508e..73ce993 100644
--- a/cnf/make.conf.example.ppc64.diff
+++ b/cnf/make.conf.example.ppc64.diff
@@ -11,7 +11,7 @@
+
+CHOST="powerpc64-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,9 +46,38 @@
diff --git a/cnf/make.conf.example.s390.diff b/cnf/make.conf.example.s390.diff
index c780762..8dd137f 100644
--- a/cnf/make.conf.example.s390.diff
+++ b/cnf/make.conf.example.s390.diff
@@ -11,7 +11,7 @@
+
+CHOST="s390-ibm-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -76,7 +83,7 @@
diff --git a/cnf/make.conf.example.sh.diff b/cnf/make.conf.example.sh.diff
index bfe9dc7..fb90124 100644
--- a/cnf/make.conf.example.sh.diff
+++ b/cnf/make.conf.example.sh.diff
@@ -17,7 +17,7 @@
+#
+CHOST="sh4-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +52,15 @@
diff --git a/cnf/make.conf.example.sparc-fbsd.diff
b/cnf/make.conf.example.sparc-fbsd.diff
index 25e6f46..2ab708b 100644
--- a/cnf/make.conf.example.sparc-fbsd.diff
+++ b/cnf/make.conf.example.sparc-fbsd.diff
@@ -11,7 +11,7 @@
+# profile and of freebsd-lib package.
+CHOST="sparc64-gentoo-freebsd6.2"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -76,7 +83,7 @@
diff --git a/cnf/make.conf.example.sparc.diff b/cnf/make.conf.example.sparc.diff
index 1055b4a..a822d6b 100644
--- a/cnf/make.conf.example.sparc.diff
+++ b/cnf/make.conf.example.sparc.diff
@@ -13,7 +13,7 @@
+#
+# CHOST="sparc-unknown-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +48,34 @@
diff --git a/cnf/make.conf.example.x86-fbsd.diff
b/cnf/make.conf.example.x86-fbsd.diff
index d5e02fe..29c75d0 100644
--- a/cnf/make.conf.example.x86-fbsd.diff
+++ b/cnf/make.conf.example.x86-fbsd.diff
@@ -14,7 +14,7 @@
+# profile and of freebsd-lib package.
+CHOST="i686-gentoo-freebsd6.1"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +49,34 @@
diff --git a/cnf/make.conf.example.x86.diff b/cnf/make.conf.example.x86.diff
index 3247126..cdea154 100644
--- a/cnf/make.conf.example.x86.diff
+++ b/cnf/make.conf.example.x86.diff
@@ -13,7 +13,7 @@
+# All K6's are i586.
+CHOST="i686-pc-linux-gnu"
+
- # Host and optimization settings
+ # Host and optimization settings
# ==============================
#
@@ -39,10 +48,65 @@
