Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ports/python-static/nacl.patch

Issue 710193003: Reduce the number of times we build a host copy of python. (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« README.rst ('K') | « ports/python-static/build.sh ('k') | ports/python-static/pkg_info » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/Include/datetime.h b/Include/datetime.h 1 diff --git a/Include/datetime.h b/Include/datetime.h
2 index c0e7ffd..b6d6036 100644 2 index c0e7ffd..b6d6036 100644
3 --- a/Include/datetime.h 3 --- a/Include/datetime.h
4 +++ b/Include/datetime.h 4 +++ b/Include/datetime.h
5 @@ -166,6 +166,8 @@ typedef struct { 5 @@ -166,6 +166,8 @@ typedef struct {
6 6
7 #ifdef Py_BUILD_CORE 7 #ifdef Py_BUILD_CORE
8 8
9 +#define PyDataTime_STATIC 1 9 +#define PyDataTime_STATIC 1
10 + 10 +
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 if test -z "$PYTHON_FOR_BUILD"; then 564 if test -z "$PYTHON_FOR_BUILD"; then
565 - for interp in python$PACKAGE_VERSION python2 python; do 565 - for interp in python$PACKAGE_VERSION python2 python; do
566 - which $interp >/dev/null 2>&1 || continue 566 - which $interp >/dev/null 2>&1 || continue
567 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7 ) and sys.version_info[0] < 3))'; then 567 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7 ) and sys.version_info[0] < 3))'; then
568 - break 568 - break
569 - fi 569 - fi
570 - interp= 570 - interp=
571 - done 571 - done
572 + case "$host" in 572 + case "$host" in
573 + *-*-nacl*) 573 + *-*-nacl*)
574 +» interp=$(cd ../../python-host/build-nacl-host && pwd)/python 574 +» interp=$(cd ../../python-host/build_host && pwd)/python
575 + ;; 575 + ;;
576 + *) 576 + *)
577 + for interp in python$PACKAGE_VERSION python2 python; do 577 + for interp in python$PACKAGE_VERSION python2 python; do
578 + which $interp >/dev/null 2>&1 || continue 578 + which $interp >/dev/null 2>&1 || continue
579 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@: >@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then 579 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@: >@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
580 + break 580 + break
581 + fi 581 + fi
582 + interp= 582 + interp=
583 + done 583 + done
584 + ;; 584 + ;;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 if test -z "$PYTHON_FOR_BUILD"; then 669 if test -z "$PYTHON_FOR_BUILD"; then
670 - for interp in python$PACKAGE_VERSION python2 python; do 670 - for interp in python$PACKAGE_VERSION python2 python; do
671 - which $interp >/dev/null 2>&1 || continue 671 - which $interp >/dev/null 2>&1 || continue
672 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ > = (2,7) and sys.version_info@<:@0@:>@ < 3))'; then 672 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ > = (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
673 - break 673 - break
674 - fi 674 - fi
675 - interp= 675 - interp=
676 - done 676 - done
677 + case "$host" in 677 + case "$host" in
678 + *-*-nacl*) 678 + *-*-nacl*)
679 +» interp=$(cd ../../python-host/build-nacl-host && pwd)/python 679 +» interp=$(cd ../../python-host/build_host && pwd)/python
680 + ;; 680 + ;;
681 + *) 681 + *)
682 + for interp in python$PACKAGE_VERSION python2 python; do 682 + for interp in python$PACKAGE_VERSION python2 python; do
683 + which $interp >/dev/null 2>&1 || continue 683 + which $interp >/dev/null 2>&1 || continue
684 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@: >@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then 684 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@: >@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
685 + break 685 + break
686 + fi 686 + fi
687 + interp= 687 + interp=
688 + done 688 + done
689 + ;; 689 + ;;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 OpenUNIX*|UnixWare*) 743 OpenUNIX*|UnixWare*)
744 @@ -2121,7 +2140,7 @@ then 744 @@ -2121,7 +2140,7 @@ then
745 LINKFORSHARED="-Wl,-E -Wl,+s";; 745 LINKFORSHARED="-Wl,-E -Wl,+s";;
746 # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; 746 # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
747 BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; 747 BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
748 - Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; 748 - Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
749 + Linux*|GNU*|NaCl*) LINKFORSHARED="-Xlinker -export-dynamic";; 749 + Linux*|GNU*|NaCl*) LINKFORSHARED="-Xlinker -export-dynamic";;
750 # -u libsys_s pulls in all symbols in libsys 750 # -u libsys_s pulls in all symbols in libsys
751 Darwin/*) 751 Darwin/*)
752 # -u _PyMac_Error is needed to pull in the mac toolbox glue, 752 # -u _PyMac_Error is needed to pull in the mac toolbox glue,
OLDNEW
« README.rst ('K') | « ports/python-static/build.sh ('k') | ports/python-static/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698