Revision: 149587 https://trac.macports.org/changeset/149587 Author: mf2k@macports.org Date: 2016-06-27 08:45:48 -0700 (Mon, 27 Jun 2016) Log Message: ----------- ninja: Add missing patch files. (#51713) Added Paths: ----------- trunk/dports/devel/ninja/files/patch-configure.diff trunk/dports/devel/ninja/files/patch-configure.py-bootstrap-only.diff Added: trunk/dports/devel/ninja/files/patch-configure.diff =================================================================== --- trunk/dports/devel/ninja/files/patch-configure.diff (rev 0) +++ trunk/dports/devel/ninja/files/patch-configure.diff 2016-06-27 15:45:48 UTC (rev 149587) @@ -0,0 +1,14 @@ +--- configure.~1~ 2016-06-26 01:31:14.000000000 -0400 ++++ configure 2016-06-26 01:35:08.000000000 -0400 +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# ++# @configure ++# ++env CXX="$CXX" python ./configure.py --bootstrap ++ed -s ./build.ninja <<EOF ++1;/^# This file/-d ++wq ++EOF ++# Ignore errors ++true Added: trunk/dports/devel/ninja/files/patch-configure.py-bootstrap-only.diff =================================================================== --- trunk/dports/devel/ninja/files/patch-configure.py-bootstrap-only.diff (rev 0) +++ trunk/dports/devel/ninja/files/patch-configure.py-bootstrap-only.diff 2016-06-27 15:45:48 UTC (rev 149587) @@ -0,0 +1,51 @@ +--- configure.py.~1~ 2016-06-26 01:10:01.000000000 -0400 ++++ configure.py 2016-06-26 01:17:28.000000000 -0400 +@@ -655,28 +655,28 @@ + n.close() + print('wrote %s.' % BUILD_FILENAME) + +-if options.bootstrap: +- print('bootstrap complete. rebuilding...') ++# if options.bootstrap: ++# print('bootstrap complete. rebuilding...') + +- rebuild_args = [] ++# rebuild_args = [] + +- if platform.can_rebuild_in_place(): +- rebuild_args.append('./ninja') +- else: +- if platform.is_windows(): +- bootstrap_exe = 'ninja.bootstrap.exe' +- final_exe = 'ninja.exe' +- else: +- bootstrap_exe = './ninja.bootstrap' +- final_exe = './ninja' +- +- if os.path.exists(bootstrap_exe): +- os.unlink(bootstrap_exe) +- os.rename(final_exe, bootstrap_exe) ++# if platform.can_rebuild_in_place(): ++# rebuild_args.append('./ninja') ++# else: ++# if platform.is_windows(): ++# bootstrap_exe = 'ninja.bootstrap.exe' ++# final_exe = 'ninja.exe' ++# else: ++# bootstrap_exe = './ninja.bootstrap' ++# final_exe = './ninja' ++ ++# if os.path.exists(bootstrap_exe): ++# os.unlink(bootstrap_exe) ++# os.rename(final_exe, bootstrap_exe) + +- rebuild_args.append(bootstrap_exe) ++# rebuild_args.append(bootstrap_exe) + +- if options.verbose: +- rebuild_args.append('-v') ++# if options.verbose: ++# rebuild_args.append('-v') + +- subprocess.check_call(rebuild_args) ++# subprocess.check_call(rebuild_args)
participants (1)
-
mf2k@macports.org