<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/141a4421d8a492f98b038feaafc928a21ae5d65d">https://github.com/macports/macports-ports/commit/141a4421d8a492f98b038feaafc928a21ae5d65d</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 141a4421d8a boost171: fix universal arm/Intel build
</span>141a4421d8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 141a4421d8a492f98b038feaafc928a21ae5d65d
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Dec 20 08:24:47 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> boost171: fix universal arm/Intel build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> backport fixes from boost176 port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/66686
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/64954
</span>---
devel/boost171/Portfile | 6 +++
.../files/patch-boost171-universal-arm-intel.diff | 58 ++++++++++++++++++++++
2 files changed, 64 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/Portfile b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 332382ba883..d23b154f6ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,6 +450,12 @@ variant universal {
</span>
if {[lsearch ${configure.universal_archs} arm*] != -1} {
build.args-append address-model=64 architecture=combined
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow universal building on arm/Intel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/64954
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/66686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-boost171-universal-arm-intel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
if {[lsearch ${configure.universal_archs} ppc*] != -1} {
if {[lsearch ${configure.universal_archs} *86*] != -1} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/files/patch-boost171-universal-arm-intel.diff b/devel/boost171/files/patch-boost171-universal-arm-intel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fcfa7de8030
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/files/patch-boost171-universal-arm-intel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libs/context/build/Jamfile.v2 libs/context/build/Jamfile.v2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 872b4f0ef..54c5db1a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/context/build/Jamfile.v2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/context/build/Jamfile.v2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -724,7 +724,7 @@ alias asm_sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : asm/make_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asm/jump_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asm/ontop_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : <abi>sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : <address-model>64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <architecture>combined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <binary-format>mach-o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libs/context/src/asm/jump_combined_sysv_macho_gas.S libs/context/src/asm/jump_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1d27afad1..34a32f785 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/context/src/asm/jump_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/context/src/asm/jump_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "jump_ppc32_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "jump_ppc64_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "jump_arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "jump_arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "No arch's"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libs/context/src/asm/make_combined_sysv_macho_gas.S libs/context/src/asm/make_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 727e9045f..b22fa7ebe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/context/src/asm/make_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/context/src/asm/make_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "make_ppc32_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "make_ppc64_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "make_arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "make_arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "No arch's"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libs/context/src/asm/ontop_combined_sysv_macho_gas.S libs/context/src/asm/ontop_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20cbeb9f2..7d254de22 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/context/src/asm/ontop_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/context/src/asm/ontop_combined_sysv_macho_gas.S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ontop_ppc32_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ontop_ppc64_sysv_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "ontop_arm_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include "ontop_arm64_aapcs_macho_gas.S"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error "No arch's"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>