aboutsummaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorIlya Tumaykin <itumaykin@gmail.com>2017-01-07 00:58:02 +0300
committerBrian Dolbec <dolsen@gentoo.org>2017-01-06 14:12:20 -0800
commit9784eec5e074924b4ee9ccb3e90582d195c6dbdc (patch)
tree4f8543dd88bb1f51a613c2d83e7c2f51ada30a6b /cnf
parentcnf/make.conf.example: Fix incorrect "it's" usage, should be "its" (diff)
downloadportage-9784eec5e074924b4ee9ccb3e90582d195c6dbdc.tar.gz
portage-9784eec5e074924b4ee9ccb3e90582d195c6dbdc.tar.bz2
portage-9784eec5e074924b4ee9ccb3e90582d195c6dbdc.zip
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@gentoo.org>
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf.example.alpha.diff2
-rw-r--r--cnf/make.conf.example.amd64-fbsd.diff2
-rw-r--r--cnf/make.conf.example.amd64.diff2
-rw-r--r--cnf/make.conf.example.arm.diff2
-rw-r--r--cnf/make.conf.example.hppa.diff2
-rw-r--r--cnf/make.conf.example.ia64.diff2
-rw-r--r--cnf/make.conf.example.m68k.diff2
-rw-r--r--cnf/make.conf.example.mips.diff2
-rw-r--r--cnf/make.conf.example.ppc.diff2
-rw-r--r--cnf/make.conf.example.ppc64.diff2
-rw-r--r--cnf/make.conf.example.s390.diff2
-rw-r--r--cnf/make.conf.example.sh.diff2
-rw-r--r--cnf/make.conf.example.sparc-fbsd.diff2
-rw-r--r--cnf/make.conf.example.sparc.diff2
-rw-r--r--cnf/make.conf.example.x86-fbsd.diff2
-rw-r--r--cnf/make.conf.example.x86.diff2
16 files changed, 16 insertions, 16 deletions
diff --git a/cnf/make.conf.example.alpha.diff b/cnf/make.conf.example.alpha.diff
index 5306999d0..83c09ea14 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 1277b6dba..a02329b7a 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 dfa4b426f..8286df65f 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 e52d1bc6f..200e47661 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 2d17b3794..78db02e3f 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 68a0cb01c..378db8a15 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 f96746142..7d82b3b10 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 7d3d83de5..0b521a7fd 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 b34de8e66..a7ef9cf73 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 961508e8f..73ce99358 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 c78076236..8dd137fe1 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 bfe9dc775..fb9012444 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 25e6f46c2..2ab708be8 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 1055b4a22..a822d6b1e 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 d5e02feb0..29c75d0d0 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 3247126d7..cdea154c8 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 @@