<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53f57e242a7dc2bc4692db47aad18d4e35bd82a1">https://github.com/macports/macports-ports/commit/53f57e242a7dc2bc4692db47aad18d4e35bd82a1</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 53f57e2 ninja: Several build fixes:
</span>53f57e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 53f57e242a7dc2bc4692db47aad18d4e35bd82a1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 9 12:58:57 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> ninja: Several build fixes:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Build with MacPorts python27 on Leopard and older to fix build and
</span><span style='display:block; white-space:pre;color:#404040;'> with macOS python on newer systems
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove configure wrapper script which seems unnecessary
</span><span style='display:block; white-space:pre;color:#404040;'> * Disable silent rules
</span><span style='display:block; white-space:pre;color:#404040;'> * Honor CXXFLAGS so that we build with the right cxx_stdlib
</span><span style='display:block; white-space:pre;color:#404040;'> * Install documentation files
</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/51210
</span>---
devel/ninja/Portfile | 44 +++++++++++++++-------
devel/ninja/files/patch-configure.diff | 14 -------
devel/ninja/files/patch-configure.py-CXXFLAGS.diff | 25 ++++++++++++
.../files/patch-configure.py-bootstrap-only.diff | 37 +++++-------------
.../patch-configure.py-use-system-python.diff | 8 ----
5 files changed, 65 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/Portfile b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4659e04..e4e689a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span>
epoch 1
github.setup ninja-build ninja 1.8.2 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,31 +30,48 @@ long_description Ninja is yet another build system. It takes as input \
</span> homepage https://ninja-build.org
checksums rmd160 4565c35672b5cddfde05fb679c80c9eef41935ef \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a67900e40f26d1cdb41381bcac56f4c219c3b424cc6d840edf727d6d566b242e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.py-use-system-python.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.py-bootstrap-only.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a67900e40f26d1cdb41381bcac56f4c219c3b424cc6d840edf727d6d566b242e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 185248
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.py-CXXFLAGS.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.py-bootstrap-only.diff
</span>
variant universal {}
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:re2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:re2c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx "${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python /usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.cmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {${configure.python}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {--with-python=${configure.python}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args --bootstrap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --verbose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args
</span>
build.cmd ./ninja
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${worksrcpath}/configure -permissions +x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -v
</span>
destroot {
xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin
xinstall -d ${destroot}${prefix}/etc/bash_completion.d
xinstall -m 644 ${worksrcpath}/misc/bash-completion ${destroot}${prefix}/etc/bash_completion.d/ninja
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COPYING \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HACKING.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</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;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-configure.diff b/devel/ninja/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68c22f8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.~1~ 2016-06-26 01:31:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-06-26 01:35:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# @configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+env CXX="$CXX" python ./configure.py --bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ed -s ./build.ninja <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+1;/^# This file/-d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+wq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Ignore errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+true
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-configure.py-CXXFLAGS.diff b/devel/ninja/files/patch-configure.py-CXXFLAGS.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..469d984
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/files/patch-configure.py-CXXFLAGS.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Honor CXXFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ninja-build/ninja/issues/673
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ninja-build/ninja/pull/676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2017-09-10 20:20:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2018-03-09 12:37:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,7 +256,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if '--bootstrap' in configure_args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_args.remove('--bootstrap')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n.variable('configure_args', ' '.join(configure_args))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-env_keys = set(['CXX', 'AR', 'CFLAGS', 'LDFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if configure_env:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,6 +397,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if 'CFLAGS' in configure_env:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags.append(configure_env['CFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ldflags.append(configure_env['CFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if 'CXXFLAGS' in configure_env:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cflags.append(configure_env['CXXFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ldflags.append(configure_env['CXXFLAGS'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n.variable('cflags', ' '.join(shell_escape(flag) for flag in cflags))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if 'LDFLAGS' in configure_env:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags.append(configure_env['LDFLAGS'])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-configure.py-bootstrap-only.diff b/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d71b61c..3648165 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.~1~ 2016-06-26 01:10:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2016-06-26 01:17:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -657,28 +657,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When running ./configure.py --bootstrap, do not automatically run ./ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2017-09-10 20:20:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2018-03-09 09:32:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -657,28 +657,3 @@
</span> n.close()
print('wrote %s.' % BUILD_FILENAME)
-if options.bootstrap:
- print('bootstrap complete. rebuilding...')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if options.bootstrap:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# print('bootstrap complete. rebuilding...')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - rebuild_args = []
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# rebuild_args = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - if platform.can_rebuild_in_place():
- rebuild_args.append('./ninja')
- else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,27 +23,10 @@
</span> - if os.path.exists(bootstrap_exe):
- os.unlink(bootstrap_exe)
- os.rename(final_exe, bootstrap_exe)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if platform.can_rebuild_in_place():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# rebuild_args.append('./ninja')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if platform.is_windows():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# bootstrap_exe = 'ninja.bootstrap.exe'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# final_exe = 'ninja.exe'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# bootstrap_exe = './ninja.bootstrap'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# final_exe = './ninja'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if os.path.exists(bootstrap_exe):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# os.unlink(bootstrap_exe)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# os.rename(final_exe, bootstrap_exe)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - rebuild_args.append(bootstrap_exe)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# rebuild_args.append(bootstrap_exe)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - if options.verbose:
- rebuild_args.append('-v')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if options.verbose:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# rebuild_args.append('-v')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - subprocess.check_call(rebuild_args)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# subprocess.check_call(rebuild_args)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-configure.py-use-system-python.diff b/devel/ninja/files/patch-configure.py-use-system-python.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5b4569..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-configure.py-use-system-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2013-09-15 20:54:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2013-09-15 20:54:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright 2001 Google Inc. All Rights Reserved.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span></pre><pre style='margin:0'>
</pre>