<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/79e493d5df714d92ac588c72a0bdaf017c640607">https://github.com/macports/macports-ports/commit/79e493d5df714d92ac588c72a0bdaf017c640607</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 79e493d5df714d92ac588c72a0bdaf017c640607
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Apr 22 12:35:36 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> python27-bootstrap: simplify prefix change
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No need to avoid actually changing prefix any more since d840f25.
</span>---
lang/python27/Portfile | 43 ++++++++++++++++++-------------------------
1 file changed, 18 insertions(+), 25 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 f8268c2..66f70ef 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;'>@@ -55,19 +55,15 @@ depends_lib port:bzip2 \
</span> depends_run port:python_select \
port:python2_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_applications ${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_frameworks ${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # This port is used by clang-3.4 to bootstrap libcxx
subport ${name}-bootstrap {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args --prefix=${my_prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_frameworks ${my_prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_applications ${my_prefix}/Applications
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${my_prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${my_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${my_prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set stdprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set frameworks_dir ${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set applications_dir ${prefix}/Applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${stdprefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${stdprefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=${prefix}/bin:$::env(PATH)
</span> configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
patchfiles-delete patch-libedit.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,28 +78,28 @@ subport ${name}-bootstrap {
</span> use_xz no
depends_extract port:xz-bootstrap
extract.suffix .tar.xz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.cmd ${my_prefix}/bin/xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.cmd ${prefix}/bin/xz
</span> }
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
clang_dependency.extra_versions 3.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-framework=${my_frameworks} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-framework=${frameworks_dir} \
</span> --enable-ipv6 \
--with-system-expat \
--with-system-ffi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${my_prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${my_prefix}/lib/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/db48
</span>
configure.ccache no
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${my_prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|g" \
</span> ${worksrcpath}/Lib/cgi.py \
${worksrcpath}/Lib/ctypes/macholib/dyld.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@APPLICATIONS_DIR@@|${my_applications}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
</span> ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +129,7 @@ the 'python' or 'python2' commands), run one or both of:
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${my_frameworks}/Python.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewpath ${frameworks_dir}/Python.framework
</span> set framewdir ${framewpath}/Versions/${branch}
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,12 +158,9 @@ platform darwin {
</span> file delete ${destroot}${framewpath}/${dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${my_prefix}/share/man/man1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${my_prefix}/lib/pkgconfig
</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}${my_prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${destroot}${my_prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/lib/pkgconfig/python-${branch}.pc ${destroot}${my_prefix}/lib/pkgconfig/
</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>
# Without this, LINKFORSHARED is set to
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,7 +178,7 @@ platform darwin {
</span>
post-destroot {
foreach unversionedFile {2to3 2to3-2 idle idle2 pydoc pydoc2 python python2 python-config python2-config pythonw pythonw2 smtpd.py smtpd2.py} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${my_prefix}/bin/${unversionedFile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/${unversionedFile}
</span> }
}
</pre><pre style='margin:0'>
</pre>