New Ticket     Tickets     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Changeset 82093


Ignore:
Timestamp:
08/07/11 15:50:11 (4 years ago)
Author:
ciserlohn@…
Message:

nodejs, nodejs-devel: actually use the python version declared in ${depends_build} (fixes #30617)

Location:
trunk/dports/devel
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/devel/nodejs-devel/Portfile

    r81593 r82093  
    3030 
    3131patchfiles              patch-Makefile-python.diff 
     32 
     33proc rec_glob {basedir pattern} { 
     34    set files [glob -directory $basedir -nocomplain -type f $pattern] 
     35    foreach dir [glob -directory $basedir -nocomplain -type d *] { 
     36        eval lappend files [rec_glob $dir $pattern] 
     37    } 
     38    return $files 
     39} 
     40 
     41set py27_bin ${prefix}/bin/python2.7 
     42 
     43post-patch { 
     44    foreach f [concat ${worksrcpath}/tools/node-waf ${worksrcpath}/tools/waf-light ${worksrcpath}/wscript [rec_glob ${worksrcpath} *.py]] { 
     45        reinplace "s|/usr/bin/env python|${py27_bin}|" ${f} 
     46    } 
     47} 
    3248 
    3349pre-configure { 
    … …  
    7692                    CFLAGS="${configure.cflags} ${configure.cc_archflags}" \ 
    7793                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \ 
    78                     PYTHON=${prefix}/bin/python2.7 
     94                    PYTHON=${py27_bin} 
    7995 
    8096livecheck.type      regex 

  • trunk/dports/devel/nodejs-devel/files/patch-Makefile-python.diff

    r81593 r82093  
    1 --- Makefile.orig       2011-08-02 18:08:14.000000000 +0200 
    2 +++ Makefile    2011-08-02 18:08:26.000000000 +0200 
    3 @@ -1,4 +1,5 @@ 
     1--- Makefile.orig       2011-08-02 09:17:41.000000000 +0200 
     2+++ Makefile    2011-08-08 00:17:31.000000000 +0200 
     3@@ -1,4 +1,4 @@ 
    44-WAF=python tools/waf-light 
    5 +PYTHON=python 
    65+WAF=$(PYTHON) tools/waf-light 
    76  
    87 web_root = ryan@nodejs.org:~/web/nodejs.org/ 
    98  
    10 @@ -33,40 +34,40 @@ 
     9@@ -33,40 +33,40 @@ 
    1110        @$(WAF) uninstall 
    1211  
    … …  
    6160 UVTEST += simple/test-assert 
    6261 UVTEST += simple/test-buffer 
    63 @@ -251,10 +252,10 @@ 
     62@@ -251,10 +251,10 @@ 
    6463  
    6564  
    … …  
    7473  
    7574 build/default/node: all 
    76 @@ -338,10 +339,10 @@ 
     75@@ -338,10 +338,10 @@ 
    7776        ./node benchmark/idle_clients.js & 
    7877  

  • trunk/dports/devel/nodejs/Portfile

    r81112 r82093  
    3131patchfiles              patch-Makefile-python.diff \ 
    3232                        patch-platform.diff 
     33 
     34proc rec_glob {basedir pattern} { 
     35    set files [glob -directory $basedir -nocomplain -type f $pattern] 
     36    foreach dir [glob -directory $basedir -nocomplain -type d *] { 
     37        eval lappend files [rec_glob $dir $pattern] 
     38    } 
     39    return $files 
     40} 
     41 
     42set py27_bin ${prefix}/bin/python2.7 
     43 
     44post-patch { 
     45    foreach f [concat ${worksrcpath}/tools/node-waf ${worksrcpath}/tools/waf-light ${worksrcpath}/wscript [rec_glob ${worksrcpath} *.py]] { 
     46        reinplace "s|/usr/bin/env python|${py27_bin}|" ${f} 
     47    } 
     48} 
    3349 
    3450pre-configure { 
    … …  
    7793                    CFLAGS="${configure.cflags} ${configure.cc_archflags}" \ 
    7894                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \ 
    79                     PYTHON=${prefix}/bin/python2.7 
     95                    PYTHON=${py27_bin} 
    8096 
    8197livecheck.type      regex 

  • trunk/dports/devel/nodejs/files/patch-Makefile-python.diff

    r77584 r82093  
    1 --- Makefile.orig       2011-03-18 22:25:20.000000000 +0100 
    2 +++ Makefile    2011-04-05 09:51:09.000000000 +0200 
    3 @@ -1,4 +1,5 @@ 
     1--- Makefile.orig       2011-08-08 00:05:27.000000000 +0200 
     2+++ Makefile    2011-08-08 00:05:41.000000000 +0200 
     3@@ -1,4 +1,4 @@ 
    44-WAF=python tools/waf-light 
    5 +PYTHON=python 
    65+WAF=$(PYTHON) tools/waf-light 
    76  
    87 web_root = ryan@nodejs.org:~/web/nodejs.org/ 
    98  
    10 @@ -23,34 +24,34 @@ 
     9@@ -23,34 +23,34 @@ 
    1110        @$(WAF) uninstall 
    1211  
    … …  
    5352 build/default/node: all 
    5453  
     54@@ -132,10 +132,10 @@ 
     55        ./node benchmark/idle_clients.js & 
     56  
     57 jslint: 
     58-       PYTHONPATH=tools/closure_linter/ python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/ 
     59+       PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/ 
     60  
     61 cpplint: 
     62-       @python tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c) 
     63+       @$(PYTHON) tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c) 
     64  
     65 lint: jslint cpplint 
     66  
Note: See TracChangeset for help on using the changeset viewer.