<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14b8b0049d90e4e35d0458d806ec09065f6bdca2">https://github.com/macports/macports-ports/commit/14b8b0049d90e4e35d0458d806ec09065f6bdca2</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 14b8b0049d9 python{27,34,35,36}: backport universal fix
</span>14b8b0049d9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14b8b0049d90e4e35d0458d806ec09065f6bdca2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 10 22:32:47 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> python{27,34,35,36}: backport universal fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix configure failure with recent Xcode.
</span>---
lang/python27/Portfile | 46 +++++++++++++-------------
lang/python34/Portfile | 61 ++++++++++++++++++----------------
lang/python35/Portfile | 65 ++++++++++++++++++++-----------------
lang/python35/files/multiarch.patch | 23 +++++++++++++
lang/python36/Portfile | 51 +++++++++++++++++------------
lang/python36/files/multiarch.patch | 23 +++++++++++++
6 files changed, 168 insertions(+), 101 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/Portfile b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db8e5234dba..07aa2b73f6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name python27
</span> epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
version 2.7.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +74,6 @@ if {${subport} eq ${name}} {
</span>
# This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_extract port:xz-bootstrap
depends_skip_archcheck-append \
xz-bootstrap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,34 +176,36 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # preserve mtime of _sysconfigdata.py to avoid rebuilding things after changing it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${buildlibdir}/_sysconfigdata.py]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir ${destroot}${framewdir}/lib/python${branch}
</span> # change LINKFORSHARED to support dependents that incorrectly use it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${buildlibdir} "awk -F : \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${libdir} "awk -F : \
</span> \"/'LINKFORSHARED'/ {printf \\\"%s: '-L${framewdir}/lib/python${branch}/config\
-lpython${branch} -ldl -framework CoreFoundation',\\n\\\", \\\$1; next} {print}\"\
_sysconfigdata.py > _sysconfigdata.py.new"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${buildlibdir}/_sysconfigdata.py.new \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename -force ${libdir}/_sysconfigdata.py.new \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${buildlibdir}/_sysconfigdata.py $oldmtime
</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:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recompile the modified file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executable differs depending on filesystem case sensitivity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/${python_for_build}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span>
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,11 +213,11 @@ platform darwin {
</span> # quite work (see ticket #15099); instead we mirror the behavior of
# `python-config --ldflags` here.
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/config/Makefile
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/config/Makefile
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/Portfile b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6c8ee90b15..178ef2b82e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name python34
</span> epoch 20170810
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
version 3.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +90,8 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --with-system-ffi
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkg-config removes -I flags for paths in CPATH, which confuses python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,16 +130,25 @@ platform darwin {
</span> set confdir config-${branch}m
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # poll() misbehaves on 10.8 and older
</span> # See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # preserve mtime of sysconfig data file to avoid rebuilding things after changing it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${buildlibdir}/_sysconfigdata.py]
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir ${destroot}${framewdir}/lib/python${branch}
</span> # Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/3.4/Python) which doesn't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,36 +158,34 @@ platform darwin {
</span> set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch}m -ldl -framework CoreFoundation',"
reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${buildlibdir}/_sysconfigdata.py $oldmtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recompile the modified file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executable differs depending on filesystem case sensitivity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/${python_for_build}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span>
# Also make the sysconfig changes in the Makefile
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,11 +214,7 @@ variant universal {
</span> ${worksrcpath}/configure
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-universalsdk=${configure.sysroot}
</span> post-configure {
set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/Portfile b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 669de2e7444..3eca4678967 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name python35
</span> epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
version 3.5.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,8 @@ patchfiles patch-setup.py.diff \
</span> patch-_osx_support.py.diff \
darwin20.diff \
implicit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiarch.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +90,8 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --with-system-ffi
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkg-config removes -I flags for paths in CPATH, which confuses python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,16 +130,25 @@ platform darwin {
</span> set confdir config-${branch}m
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # poll() misbehaves on 10.8 and older
</span> # See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # preserve mtime of sysconfig data file to avoid rebuilding things after changing it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${buildlibdir}/_sysconfigdata.py]
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir ${destroot}${framewdir}/lib/python${branch}
</span> # Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/3.5/Python) which doesn't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,36 +158,35 @@ platform darwin {
</span> set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch}m -ldl -framework CoreFoundation',"
reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${buildlibdir}/_sysconfigdata.py $oldmtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recompile the modified file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executable differs depending on filesystem case sensitivity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/${python_for_build}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -OO -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata.py]"
</span>
# Also make the sysconfig changes in the Makefile
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,11 +215,7 @@ variant universal {
</span> ${worksrcpath}/configure
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-universalsdk=${configure.sysroot}
</span> post-configure {
set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/files/multiarch.patch b/lang/python35/files/multiarch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..81024768a74
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/files/multiarch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/pull/28845
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-09-05 17:22:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-05-10 21:31:09.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5251,7 +5251,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5380,6 +5379,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest.c conftest.out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test x$PLATFORM_TRIPLET != xdarwin; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MULTIARCH=$($CC --print-multiarch 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1a21f07800..66bf52129d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name python36
</span> epoch 20170717
# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
version 3.6.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,8 @@ patchfiles patch-setup.py.diff \
</span> patch-_osx_support.py.diff \
darwin20.diff \
implicit.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sysconfig.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiarch.patch
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,6 +87,8 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --with-system-ffi
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkg-config removes -I flags for paths in CPATH, which confuses python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +117,7 @@ platform darwin {
</span> set framewpath ${frameworks_dir}/Python.framework
set framewdir ${framewpath}/Versions/${branch}
set confdir config-${branch}m-darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-configure {
# poll() misbehaves on 10.8 and older
# See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,11 +127,17 @@ platform darwin {
</span> file mtime ${worksrcpath}/pyconfig.h $oldmtime
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # preserve mtime of sysconfig data file to avoid rebuilding things after changing it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py]
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir ${destroot}${framewdir}/lib/python${branch}
</span> # Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
# (this becomes Python.framework/Versions/3.6/Python) which doesn't
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,36 +147,35 @@ platform darwin {
</span> set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch}m -ldl -framework CoreFoundation',"
reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_m_darwin_darwin.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_m_darwin_darwin.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_m_darwin_darwin.py
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${buildlibdir}/_sysconfigdata_m_darwin_darwin.py $oldmtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # recompile the modified file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # executable differs depending on filesystem case sensitivity
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${worksrcpath}/${python_for_build}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_for_build python
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${prefix}/lib/pkgconfig/python-${branch}m.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_m_darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_m_darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -OO -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_m_darwin_darwin.py]"
</span>
# Also make the sysconfig changes in the Makefile
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span>
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/${confdir}/Makefile
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/files/multiarch.patch b/lang/python36/files/multiarch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3f8bfa1dc3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/files/multiarch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/pull/28845
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-09-04 13:49:41.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-05-10 20:44:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5203,7 +5203,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5334,6 +5333,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f conftest.c conftest.out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test x$PLATFORM_TRIPLET != xdarwin; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MULTIARCH=$($CC --print-multiarch 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5
</span></pre><pre style='margin:0'>
</pre>