1 |
commit: 5367729eef04d16d496434c7a6ab037d635326e0 |
2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 10 14:28:48 2020 +0000 |
4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 11 08:10:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5367729e |
7 |
|
8 |
profiles: new arch and profile for x64-winnt |
9 |
|
10 |
New profile prefix/windows/winnt/x64, for new ARCH=x64-winnt. |
11 |
|
12 |
This profile is designed for use as Stacked Prefix, set up using |
13 |
prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin |
14 |
Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). |
15 |
|
16 |
CHOST is left unset on purpose. It is set by prefix-stack-setup |
17 |
using some --chost=x86_64-msvc16-winnt argument, selecting the |
18 |
Visual Studio version and runtime variant (static|debug) to use. |
19 |
|
20 |
Adding same comments to prefix/windows/winnt/x86 profile as well. |
21 |
|
22 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
23 |
|
24 |
profiles/arch.list | 1 + |
25 |
profiles/arch/base/make.defaults | 2 +- |
26 |
profiles/embedded/make.defaults | 2 +- |
27 |
profiles/prefix/windows/winnt/x64/eapi | 1 + |
28 |
profiles/prefix/windows/winnt/x64/make.defaults | 28 +++++++++++++++++++++++++ |
29 |
profiles/prefix/windows/winnt/x64/parent | 1 + |
30 |
profiles/prefix/windows/winnt/x86/make.defaults | 18 +++++++++++++++- |
31 |
profiles/profiles.desc | 1 + |
32 |
8 files changed, 51 insertions(+), 3 deletions(-) |
33 |
|
34 |
diff --git a/profiles/arch.list b/profiles/arch.list |
35 |
index b9a9c022c00..d44231f28c3 100644 |
36 |
--- a/profiles/arch.list |
37 |
+++ b/profiles/arch.list |
38 |
@@ -29,6 +29,7 @@ sparc-solaris |
39 |
sparc64-solaris |
40 |
x64-solaris |
41 |
x86-solaris |
42 |
+x64-winnt |
43 |
x86-winnt |
44 |
x64-cygwin |
45 |
x86-cygwin |
46 |
|
47 |
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults |
48 |
index 5dc717cefd4..81f92b89ebe 100644 |
49 |
--- a/profiles/arch/base/make.defaults |
50 |
+++ b/profiles/arch/base/make.defaults |
51 |
@@ -3,6 +3,6 @@ |
52 |
|
53 |
USE_EXPAND_UNPREFIXED="ARCH" |
54 |
USE_EXPAND_IMPLICIT="ARCH" |
55 |
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" |
56 |
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" |
57 |
|
58 |
PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" |
59 |
|
60 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
61 |
index 601d31cd84a..c6dc06a3c23 100644 |
62 |
--- a/profiles/embedded/make.defaults |
63 |
+++ b/profiles/embedded/make.defaults |
64 |
@@ -23,7 +23,7 @@ LINGUAS="en" |
65 |
IUSE_IMPLICIT="prefix prefix-guest prefix-stack" |
66 |
USE_EXPAND_UNPREFIXED="ARCH" |
67 |
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" |
68 |
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" |
69 |
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" |
70 |
USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt" |
71 |
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt" |
72 |
USE_EXPAND_VALUES_USERLAND="BSD GNU" |
73 |
|
74 |
diff --git a/profiles/prefix/windows/winnt/x64/eapi b/profiles/prefix/windows/winnt/x64/eapi |
75 |
new file mode 100644 |
76 |
index 00000000000..7ed6ff82de6 |
77 |
--- /dev/null |
78 |
+++ b/profiles/prefix/windows/winnt/x64/eapi |
79 |
@@ -0,0 +1 @@ |
80 |
+5 |
81 |
|
82 |
diff --git a/profiles/prefix/windows/winnt/x64/make.defaults b/profiles/prefix/windows/winnt/x64/make.defaults |
83 |
new file mode 100644 |
84 |
index 00000000000..1200225e106 |
85 |
--- /dev/null |
86 |
+++ b/profiles/prefix/windows/winnt/x64/make.defaults |
87 |
@@ -0,0 +1,28 @@ |
88 |
+# Copyright 1999-2020 Gentoo Authors |
89 |
+# Distributed under the terms of the GNU General Public License v2 |
90 |
+ |
91 |
+# This profile is designed for use as Stacked Prefix, set up using |
92 |
+# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin |
93 |
+# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). |
94 |
+# |
95 |
+# CHOST is left unset on purpose. It is set by prefix-stack-setup |
96 |
+# using some --chost=x86_64-msvc16-winnt argument, selecting the |
97 |
+# Visual Studio version and runtime variant (static|debug) to use. |
98 |
+# |
99 |
+# Sample CHOST values for the runtime variant using x64 Visual Studio 2019, |
100 |
+# as provided by parity-2.0.0 (multithreaded only): |
101 |
+# x86_64-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) |
102 |
+# x86_64-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) |
103 |
+# x86_64-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) |
104 |
+# x86_64-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) |
105 |
+# |
106 |
+ |
107 |
+ARCH="x64-winnt" |
108 |
+ACCEPT_KEYWORDS="~x64-winnt" |
109 |
+ |
110 |
+# multilib build stuff, single ABI (no multilib) |
111 |
+MULTILIB_ABIS="amd64" |
112 |
+DEFAULT_ABI="amd64" |
113 |
+ABI="amd64" |
114 |
+IUSE_IMPLICIT="abi_x86_64" |
115 |
+LIBDIR_amd64="lib" |
116 |
|
117 |
diff --git a/profiles/prefix/windows/winnt/x64/parent b/profiles/prefix/windows/winnt/x64/parent |
118 |
new file mode 100644 |
119 |
index 00000000000..f3229c5b987 |
120 |
--- /dev/null |
121 |
+++ b/profiles/prefix/windows/winnt/x64/parent |
122 |
@@ -0,0 +1 @@ |
123 |
+.. |
124 |
|
125 |
diff --git a/profiles/prefix/windows/winnt/x86/make.defaults b/profiles/prefix/windows/winnt/x86/make.defaults |
126 |
index 3c45b788d16..0c11ef592e9 100644 |
127 |
--- a/profiles/prefix/windows/winnt/x86/make.defaults |
128 |
+++ b/profiles/prefix/windows/winnt/x86/make.defaults |
129 |
@@ -1,6 +1,22 @@ |
130 |
-# Copyright 1999-2019 Gentoo Authors |
131 |
+# Copyright 1999-2010 Gentoo Authors |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
|
134 |
+# This profile is designed for use as Stacked Prefix, set up using |
135 |
+# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin |
136 |
+# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). |
137 |
+# |
138 |
+# CHOST is left unset on purpose. It is set by prefix-stack-setup |
139 |
+# using some --chost=i686-msvc16-winnt argument, selecting the |
140 |
+# Visual Studio version and runtime variant (static|debug) to use. |
141 |
+# |
142 |
+# Sample CHOST values for the runtime variant using x86 Visual Studio 2019, |
143 |
+# as provided by parity-2.0.0 (multithreaded only): |
144 |
+# i686-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) |
145 |
+# i686-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) |
146 |
+# i686-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) |
147 |
+# i686-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) |
148 |
+# |
149 |
+ |
150 |
ARCH="x86-winnt" |
151 |
ACCEPT_KEYWORDS="~x86-winnt" |
152 |
|
153 |
|
154 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
155 |
index 47eebf05283..8cf15e892e9 100644 |
156 |
--- a/profiles/profiles.desc |
157 |
+++ b/profiles/profiles.desc |
158 |
@@ -323,6 +323,7 @@ ppc-aix prefix/aix/7.2.0.0/ppc exp |
159 |
|
160 |
# Windows Profiles |
161 |
x86-winnt prefix/windows/winnt/x86 exp |
162 |
+x64-winnt prefix/windows/winnt/x64 exp |
163 |
|
164 |
# Cygwin Profiles |
165 |
x86-cygwin prefix/windows/cygwin/x86 exp |