<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af8ade06aac5e0855e349a5648d98088c5150d3a">https://github.com/macports/macports-ports/commit/af8ade06aac5e0855e349a5648d98088c5150d3a</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 af8ade06aac texlive-bin: fix universal build
</span>af8ade06aac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af8ade06aac5e0855e349a5648d98088c5150d3a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jun 8 10:46:07 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> texlive-bin: fix universal build
</span>---
tex/texlive-bin/Portfile | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/Portfile b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9438e45b67..3b54210a95f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup texlive 1.0
</span>
# luajittex requires muniversal (and some patches to configure
# scripts) to build universal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span>
name texlive-bin
version 2022.62882
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,6 @@ long_description TeX Live is an easy way to get up and running with TeX. \
</span> software, including support for many languages around the world.
homepage http://www.tug.org/texlive/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
# This port installs two libraries: kpathsea (LGPL-2.1+) and ptexenc (BSD).
# The binaries are covered under various licenses, but all distributable;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,24 +206,13 @@ configure.ldflags-delete -L${prefix}/lib
</span> configure.cppflags-append -isystem${prefix}/include
configure.env-append LIBRARY_PATH=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # luajittex does not support ppc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(ppc) --disable-luajittex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(ppc64) --disable-luajittex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch -- ${configure.build_arch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ppc -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ppc64 { configure.args-append --disable-luajittex }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.ppc-append --disable-luajittex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args.ppc64-append --disable-luajittex
</span>
# work around bug in texlive makefiles where $OBJC is not recorded
# during configure phase
build.env OBJC=${configure.objc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "OBJCFLAGS=${configure.objcflags} [get_canonical_archflags objc]" \
</span> OBJCXX=${configure.objcxx}
# this is not optimal, but we have to duplicate this cxx11 PG logic here
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,7 +223,12 @@ if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
</span> if {[string match macports-libstdc++ ${configure.cxx_stdlib}]} {
lappend configure.objcxxflags -D_GLIBCXX_USE_CXX11_ABI=0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "OBJCXXFLAGS=${configure.objcxxflags} [get_canonical_archflags objcxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch {arm64 x86_64 i386 ppc ppc64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env.${arch}-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OBJCFLAGS=${configure.objcflags} [muniversal::get_archflag objc ${arch}]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OBJCXXFLAGS=${configure.objcxxflags} [muniversal::get_archflag objcxx ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# work around differences between libc++ and libstdc++ headers building with clang
# https://trac.macports.org/ticket/54358#comment:26
</pre><pre style='margin:0'>
</pre>