<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/a267af4cff171b9e2e918ad8368a9c3603850a11">https://github.com/macports/macports-guide/commit/a267af4cff171b9e2e918ad8368a9c3603850a11</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a267af4 update possible archs
</span>a267af4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a267af4cff171b9e2e918ad8368a9c3603850a11
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 22 13:02:59 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> update possible archs
</span>---
guide/adoc/macports.conf.adoc | 12 ++++++------
guide/adoc/portfile-keywords.adoc | 4 ++--
guide/adoc/portfile-phase.adoc | 12 +++++++++---
guide/xml/macports.conf.xml | 13 +++++++------
guide/xml/portfile-phase.xml | 9 ++++++---
5 files changed, 30 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/adoc/macports.conf.adoc b/guide/adoc/macports.conf.adoc
</span><span style='display:block; white-space:pre;color:#808080;'>index 6dcd242..bed14f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/adoc/macports.conf.adoc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/adoc/macports.conf.adoc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +51,11 @@ Default: `+sqlite+`
</span>
build_arch::
The machine architecture for which to build in normal use.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Options include: ppc, i386, ppc64, x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Options include: arm64, i386, ppc, ppc64, x86_64
</span> +
Default:
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(Snow Leopard and later) `+x86_64+` or `+i386+` depending on hardware
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Snow Leopard and later) `+arm64+`, `+x86_64+` or `+i386+` depending on hardware
</span> +
(Leopard/Tiger) `+i386+` or `+ppc+` depending on hardware
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,10 +183,10 @@ Default: rebuild
</span> Options for MacPorts Universal Binaries (+universal variant)
universal_archs::
<span style='display:block; white-space:pre;background:#ffe0e0;'>-The machine architectures to use for +universal variant (multiple entries must be space delimited). Options include: ppc, i386, ppc64, x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The machine architectures to use for +universal variant (multiple entries must be space delimited). Options include: arm64, i386, ppc, ppc64, x86_64
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Default: `+x86_64 i386+` (``+ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-i386+`` for 10.5 and earlier)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Default: `+arm64 x86_64+` for macOS 11 and later, `+x86_64 i386+` for 10.6 through 10.13, ``+ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+i386+`` for 10.5 and earlier
</span>
Options for StartupItems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,4 +235,4 @@ Optional local repositories are enabled using a file url: `+file:///path/to/loca
</span> This optional file specifies any variants you'd like to be invoked globally.
If a variant specified in this file is not supported by a given Portfile, the variant is simply ignored.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Default: none
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Default: none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/adoc/portfile-keywords.adoc b/guide/adoc/portfile-keywords.adoc
</span><span style='display:block; white-space:pre;color:#808080;'>index fed95c9..2a4629b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/adoc/portfile-keywords.adoc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/adoc/portfile-keywords.adoc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ platforms darwin
</span> ----
supported_archs::
The CPU architectures for which this port can be built.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Archs currently supported by macOS are: i386, ppc, ppc64, x86_64.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Archs currently supported by macOS are: arm64, i386, ppc, ppc64, x86_64.
</span> If this option is not set, it is assumed that the port can build for all archs.
If a port does not install any architecture-specific files, use the special value ``+noarch+``.
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,4 +239,4 @@ use_xcode no
</span> [source]
----
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-----
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+----
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/adoc/portfile-phase.adoc b/guide/adoc/portfile-phase.adoc
</span><span style='display:block; white-space:pre;color:#808080;'>index e8482a2..83b9950 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/adoc/portfile-phase.adoc
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/adoc/portfile-phase.adoc
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1407,7 +1407,9 @@ Default value is based on ``+${configure.universal_archs}+``.
</span> +
(Intel Tiger / Leopard) `+-arch i386 -arch ppc+`
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(Snow Leopard and later) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Snow Leopard through High Sierra) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Big Sur and later) `+-arch arm64 -arch x86_64+`
</span> * Example:
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1442,7 +1444,9 @@ Default value is based on ``+${configure.universal_archs}+``.
</span> +
(Intel Tiger / Leopard) `+-arch i386 -arch ppc+`
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(Snow Leopard and later) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Snow Leopard through High Sierra) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Big Sur and later) `+-arch arm64 -arch x86_64+`
</span> * Example:
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1460,7 +1464,9 @@ Additional flags to put in the LDFLAGS environment variable when invoking the co
</span> +
(Intel Tiger / Leopard) `+-arch i386 -arch ppc+`
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-(Snow Leopard and later) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Snow Leopard through High Sierra) `+-arch x86_64 -arch i386+`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(Big Sur and later) `+-arch arm64 -arch x86_64+`
</span> * Example:
+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/macports.conf.xml b/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c28f17..f47f474 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/macports.conf.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +96,10 @@
</span>
<listitem>
<para>The machine architecture for which to build in normal use.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Options include: ppc, i386, ppc64, x86_64</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Options include: arm64, i386, ppc, ppc64, x86_64</para>
</span>
<para>Default: </para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>(Snow Leopard and later) <option>x86_64</option> or <option>i386</option> depending on hardware</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Snow Leopard and later) <option>arm64</option>, <option>x86_64</option> or <option>i386</option> depending on hardware</para>
</span> <para>(Leopard/Tiger) <option>i386</option> or <option>ppc</option> depending on hardware</para>
</listitem>
</varlistentry>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,11 +352,12 @@
</span>
<listitem>
<para>The machine architectures to use for +universal variant
<span style='display:block; white-space:pre;background:#ffe0e0;'>- (multiple entries must be space delimited). Options include: ppc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386, ppc64, x86_64</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (multiple entries must be space delimited). Options include: arm64,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386, ppc, ppc64, x86_64</para>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>Default: <option>x86_64 i386</option> (<option>ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i386</option> for 10.5 and earlier)</para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>Default: <option>arm64 x86_64</option> for macOS 11 and later,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <option>x86_64 i386</option> for 10.6 through 10.13, <option>ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386</option> for 10.5 and earlier</para>
</span> </listitem>
</varlistentry>
</variablelist>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/guide/xml/portfile-phase.xml b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;color:#808080;'>index f9405bf..ce0a1fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/guide/xml/portfile-phase.xml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2456,7 +2456,8 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span> <para>Default: </para>
<para>(PowerPC Tiger) <literal>-isysroot ${developer_dir}/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc</literal></para>
<para>(Intel Tiger / Leopard) <literal>-arch i386 -arch ppc</literal></para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>(Snow Leopard and later) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Snow Leopard through High Sierra) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Big Sur and later) <literal>-arch arm64 -arch x86_64</literal></para>
</span> </listitem>
<listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2504,7 +2505,8 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span> <para>Default: </para>
<para>(PowerPC Tiger) <literal>-isysroot ${developer_dir}/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc</literal></para>
<para>(Intel Tiger / Leopard) <literal>-arch i386 -arch ppc</literal></para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>(Snow Leopard and later) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Snow Leopard through High Sierra) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Big Sur and later) <literal>-arch arm64 -arch x86_64</literal></para>
</span> </listitem>
<listitem>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2528,7 +2530,8 @@ configure.post_args OPT="-D__DARWIN_UNIX03"</programlisting>
</span> <para>Default: </para>
<para>(PowerPC Tiger) <literal>-Wl,-syslibroot,${developer_dir}/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc</literal></para>
<para>(Intel Tiger / Leopard) <literal>-arch i386 -arch ppc</literal></para>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- <para>(Snow Leopard and later) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Snow Leopard through High Sierra) <literal>-arch x86_64 -arch i386</literal></para>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <para>(Big Sur and later) <literal>-arch arm64 -arch x86_64</literal></para>
</span> </listitem>
<listitem>
</pre><pre style='margin:0'>
</pre>