[128127] trunk/dports/lang/ispc

[takeshi at macports.org]

Revision: 128127
          https://trac.macports.org/changeset/128127
Author:   takeshi at macports.org
Date:     2014-11-13 17:49:31 -0800 (Thu, 13 Nov 2014)
Log Message:
-----------
ispc: use MacPorts' python2.7 explicitly

Modified Paths:
--------------
    trunk/dports/lang/ispc/Portfile

Added Paths:
-----------
    trunk/dports/lang/ispc/files/
    trunk/dports/lang/ispc/files/patch-Makefile.diff

Modified: trunk/dports/lang/ispc/Portfile
===================================================================
--- trunk/dports/lang/ispc/Portfile	2014-11-14 00:40:41 UTC (rev 128126)
+++ trunk/dports/lang/ispc/Portfile	2014-11-14 01:49:31 UTC (rev 128127)
@@ -5,6 +5,7 @@
 PortGroup           github 1.0
 
 github.setup        ispc ispc 1.8.0 v
+revision            1
 categories          lang parallel               
 platforms           darwin
 supported_archs     x86_64
@@ -26,12 +27,13 @@
 
 depends_build       port:bison \
                     port:flex \
-                    bin:python:python27
+                    port:python27
 depends_lib         port:clang-${llvm_version}
 
 use_configure       no
 
 configure.compiler  macports-clang-${llvm_version}
+patchfiles          patch-Makefile.diff
 post-patch {
     if {[variant_isset doc]} {
         reinplace {s|rst2html.py|rst2html-2.7.py|} ${worksrcpath}/docs/build.sh
@@ -39,6 +41,7 @@
 }
 
 build.args          LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
+                    PYTHON=${prefix}/bin/python2.7 \
                     CLANG=${configure.cc}\
                     CXX=${configure.cxx} \
                     OPT="${configure.cxxflags} -fvisibility=hidden" \

Added: trunk/dports/lang/ispc/files/patch-Makefile.diff
===================================================================
--- trunk/dports/lang/ispc/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/lang/ispc/files/patch-Makefile.diff	2014-11-14 01:49:31 UTC (rev 128127)
@@ -0,0 +1,67 @@
+--- Makefile.orig	2014-10-17 06:24:36.000000000 +0900
++++ Makefile	2014-11-14 10:40:22.000000000 +0900
+@@ -57,6 +57,8 @@
+ ==============================================================================
+ endef
+ 
++PYTHON = python
++
+ # If you have your own special version of llvm and/or clang, change
+ # these variables to match.
+ LLVM_CONFIG=$(shell which llvm-config)
+@@ -308,45 +310,45 @@
+ 
+ objs/builtins-dispatch.cpp: builtins/dispatch.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $<
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
++	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | $(PYTHON) bitcode2cpp.py $< > $@
+ 
+ objs/builtins-%-32bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $< \(32 bit version\)
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
++	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | $(PYTHON) bitcode2cpp.py $< 32bit > $@
+ 
+ objs/builtins-%-64bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
+ 	@echo Creating C++ source from builtins definition file $< \(64 bit version\)
+-	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
++	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | $(PYTHON) bitcode2cpp.py $< 64bit > $@
+ 
+ objs/builtins-c-32.cpp: builtins/builtins.c
+ 	@echo Creating C++ source from builtins definition file $<
+-	@$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
++	@$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | $(PYTHON) bitcode2cpp.py c 32 > $@
+ 
+ objs/builtins-c-64.cpp: builtins/builtins.c
+ 	@echo Creating C++ source from builtins definition file $<
+-	@$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
++	@$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | $(PYTHON) bitcode2cpp.py c 64 > $@
+ 
+ objs/stdlib_mask1_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask1
+ 	@$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+-		python stdlib2cpp.py mask1 > $@
++		$(PYTHON) stdlib2cpp.py mask1 > $@
+ 
+ objs/stdlib_mask8_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask8
+ 	@$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+-		python stdlib2cpp.py mask8 > $@
++		$(PYTHON) stdlib2cpp.py mask8 > $@
+ 
+ objs/stdlib_mask16_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask16
+ 	@$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+-		python stdlib2cpp.py mask16 > $@
++		$(PYTHON) stdlib2cpp.py mask16 > $@
+ 
+ objs/stdlib_mask32_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask32
+ 	@$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+-		python stdlib2cpp.py mask32 > $@
++		$(PYTHON) stdlib2cpp.py mask32 > $@
+ 
+ objs/stdlib_mask64_ispc.cpp: stdlib.ispc
+ 	@echo Creating C++ source from $< for mask64
+ 	@$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
+-		python stdlib2cpp.py mask64 > $@
++		$(PYTHON) stdlib2cpp.py mask64 > $@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141113/ca73999b/attachment-0001.html>