<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/d11c2377c9cff32cd5cb6a0ed11788cc46862c1a">https://github.com/macports/macports-ports/commit/d11c2377c9cff32cd5cb6a0ed11788cc46862c1a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d11c2377c9cff32cd5cb6a0ed11788cc46862c1a
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Feb 18 15:46:37 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> python27-bootstrap: removed unrequired dependcies
</span>---
devel/libtapi/Portfile | 2 +-
lang/llvm-3.3/Portfile | 4 +--
lang/llvm-3.4/Portfile | 18 +++++--------
lang/python27/Portfile | 70 ++++++++++++++++++++++++++------------------------
4 files changed, 45 insertions(+), 49 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/Portfile b/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43425b19d7f..8574e64d022 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ platform darwin {
</span> if {${os.major} < 11} {
# system python is too old, use python27-bootstrap to minimize dependencies
depends_build-append port:python27-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/libexec/libcxx-bootstrap/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/libexec/python27-bootstrap/bin/python2.7
</span> depends_skip_archcheck-append python27-bootstrap
} elseif {${os.major} > 19} {
# Use system python 3.x
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.3/Portfile b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 26e9b8cc2e0..f8d3fc505e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,6 @@ revision 13
</span> subport clang-${llvm_version} { revision 14 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# prefix for deps using libstdc++ on a libc++ system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set bootstrap_prefix ${prefix}/libexec/libcxx-bootstrap
</span> dist_subdir llvm
categories lang
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,7 +134,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # force to libstdc++ so we can use default bootstrap compilers
configure.cxx_stdlib libstdc++
depends_build-append port:python27-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonfullpath ${bootstrap_prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/libexec/python27-bootstrap/bin/python2.7
</span> } else {
depends_build-append port:python27
set pythonfullpath ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 118b8e3f947..c5ef62c050f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> set llvm_version 3.4
set llvm_version_no_dot 34
name llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 16
</span> subport clang-${llvm_version} { revision 16 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# prefix for deps using libstdc++ on a libc++ system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set bootstrap_prefix ${prefix}/libexec/libcxx-bootstrap
</span> dist_subdir llvm
categories lang
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,15 +75,11 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libstdc++
</span> # Have to also use bootstrap versions of deps that use libstdc++ in
# order to be able to build libc++.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:python27 port:python27-bootstrap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses port:ncurses-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${bootstrap_prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${bootstrap_prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${bootstrap_prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:python27 port:python27-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:ncurses
</span> }
version ${llvm_version}.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +189,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> if {${cxx_stdlib} eq "libc++"} {
configure.cxx_stdlib libstdc++
depends_build-append port:python27-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${bootstrap_prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python=${prefix}/libexec/python27-bootstrap/bin/python2.7
</span> } else {
depends_build-append port:python27
configure.args-append --with-python=${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +201,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> select.file ${filespath}/mp-${subport}
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python=${bootstrap_prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python=${prefix}/libexec/python27-bootstrap/bin/python2.7
</span> } else {
configure.args-append --with-python=${prefix}/bin/python2.7
}
<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 857386f154f..5ab2174655f 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;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup openssl 1.0
</span> PortGroup clang_dependency 1.0
name python27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +50,11 @@ if {${os.platform} eq "darwin" && ${os.major} >= 21} {
</span> patchfiles-append patch-getpath.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:bzip2 \
</span> port:db48 \
port:expat \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,43 +63,43 @@ depends_lib port:bzip2 \
</span> port:ncurses \
port:sqlite3 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:python_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:python_select \
</span> port:python2_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 stdprefix ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix ${prefix}/libexec/libcxx-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr {${revision} + 1} ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract port:xz-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xz-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.suffix .tar.xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.cmd ${prefix}/libexec/xz-bootstrap/bin/xz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix ${prefix}/libexec/${subport}
</span> set frameworks_dir ${prefix}/Library/Frameworks
set applications_dir ${prefix}/Applications
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${stdprefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${stdprefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${prefix}/bin:$::env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid macports-clang dep (doesn't use C++ anyway)
</span> configure.cxx_stdlib
compiler.whitelist clang llvm-gcc-4.2 gcc-4.2 apple-gcc-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-replace port:pkgconfig port:pkgconfig-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace port:ncurses port:ncurses-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:db48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libedit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # no need to be 'port select'able
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract port:xz-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append xz-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.suffix .tar.xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.cmd ${stdprefix}/libexec/xz-bootstrap/bin/xz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libstdc++ can't be used on Mojave and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args ac_cv_header_libintl_h=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_lib_intl_textdomain=no \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_search_bind_textdomain_codeset=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sterilize MacPorts build environment; we want nothing picked up from MP prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.library_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.distcc no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sterilize PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PATH=/usr/bin:/bin:/usr/sbin:/sbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=/usr/bin:/bin:/usr/sbin:/sbin
</span> }
# Also needed by later clangs.
if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,8 +112,10 @@ configure.args-append \
</span> --with-system-expat \
--with-system-ffi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.ccache no
# pkg-config removes -I flags for paths in CPATH, which confuses python.
</pre><pre style='margin:0'>
</pre>