[71980] trunk/dports/devel/tbb

[ryandesign at macports.org]

Revision: 71980
          http://trac.macports.org/changeset/71980
Author:   ryandesign at macports.org
Date:     2010-09-29 06:15:56 -0700 (Wed, 29 Sep 2010)
Log Message:
-----------
tbb: ensure we're UsingTheRightCompiler; see #23944

Modified Paths:
--------------
    trunk/dports/devel/tbb/Portfile

Added Paths:
-----------
    trunk/dports/devel/tbb/files/
    trunk/dports/devel/tbb/files/patch-build-macos.inc.diff

Modified: trunk/dports/devel/tbb/Portfile
===================================================================
--- trunk/dports/devel/tbb/Portfile	2010-09-29 12:37:09 UTC (rev 71979)
+++ trunk/dports/devel/tbb/Portfile	2010-09-29 13:15:56 UTC (rev 71980)
@@ -28,6 +28,8 @@
                     sha1    0c10aaa7f60762a4a2c2c907a2fee552eba4132c \
                     rmd160  52882e20b0753b669bda60bce7f61f20f3245a86
 
+patchfiles          patch-build-macos.inc.diff
+
 use_configure       no
 build.target        tbb tbbmalloc
 
@@ -43,11 +45,14 @@
         set arch_flag ${build_arch}
     }
 }
+
+set compilers       "CONLY=${configure.cc} CPLUS=${configure.cxx}"
+build.args-append   ${compilers}
 build.env-append    arch=${arch_flag}
 test.env-append     arch=${arch_flag}
 
 destroot {
-    set build_dir [exec sh -c "cd ${worksrcpath} && ${build.env} make info | grep build_prefix | cut -f2 -d'='"]
+    set build_dir [exec sh -c "cd ${worksrcpath} && ${build.env} make info ${compilers} | grep build_prefix | cut -f2 -d'='"]
     set build_dir "${worksrcpath}/build/${build_dir}_release"
     
     # fix paths

Added: trunk/dports/devel/tbb/files/patch-build-macos.inc.diff
===================================================================
--- trunk/dports/devel/tbb/files/patch-build-macos.inc.diff	                        (rev 0)
+++ trunk/dports/devel/tbb/files/patch-build-macos.inc.diff	2010-09-29 13:15:56 UTC (rev 71980)
@@ -0,0 +1,11 @@
+--- build/macos.inc.orig	2010-04-21 09:21:19.000000000 -0500
++++ build/macos.inc	2010-09-29 07:50:16.000000000 -0500
+@@ -43,7 +43,7 @@
+ 
+ ifndef runtime
+  #gcc_version:=$(shell gcc -v 2>&1 | grep 'gcc version' | sed -e 's/^gcc version //' | sed -e 's/ .*$$//' )
+- gcc_version_full=$(shell gcc --version | grep 'gcc'| egrep -o ' [0-9]+\.[0-9]+\.[0-9]+.*' | sed -e 's/^\ //')
++ gcc_version_full=$(shell $(CONLY) --version | grep 'gcc'| egrep -o ' [0-9]+\.[0-9]+\.[0-9]+.*' | sed -e 's/^\ //')
+  gcc_version=$(shell echo "$(gcc_version_full)" | egrep -o '^[0-9]+\.[0-9]+\.[0-9]+\s*' | head -n 1 | sed -e 's/ *//g')
+  os_version:=$(shell /usr/bin/sw_vers -productVersion)
+  export runtime:=cc$(gcc_version)_os$(os_version)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100929/158ce6c6/attachment.html>