[117085] trunk/dports/devel/tbb/Portfile

[ryandesign at macports.org]

Revision: 117085
          https://trac.macports.org/changeset/117085
Author:   ryandesign at macports.org
Date:     2014-02-15 08:13:36 -0800 (Sat, 15 Feb 2014)
Log Message:
-----------
tbb: use the correct install_name at build time, to avoid having to change it later, since that can fail when the prefix is longer since we're not using headerpad_max_install_names (#42507)

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

Modified: trunk/dports/devel/tbb/Portfile
===================================================================
--- trunk/dports/devel/tbb/Portfile	2014-02-15 14:35:04 UTC (rev 117084)
+++ trunk/dports/devel/tbb/Portfile	2014-02-15 16:13:36 UTC (rev 117085)
@@ -59,6 +59,9 @@
     reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/build/macos.inc
     reinplace "/^CONLY *=/s|=.*$|= ${configure.cc}|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
     reinplace "/^CPLUS *=/s|=.*$|= ${configure.cxx}|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
+
+    # http://software.intel.com/en-us/forums/topic/505370
+    reinplace "/ -dynamiclib/s|$| -install_name ${prefix}/lib/\$@|g" ${worksrcpath}/build/macos.${tbb_compiler}.inc
 }
 
 build.target        tbb tbbmalloc tbbproxy
@@ -86,11 +89,6 @@
     eval copy [glob ${destroot.dir}/tbbvars.*sh] ${destroot}${prefix}/bin
     copy ${worksrcpath}/include/tbb ${destroot}${prefix}/include/tbb
 
-    # fix install_name paths
-    # http://software.intel.com/en-us/forums/topic/505370
-    system "install_name_tool -id ${prefix}/lib/libtbb.dylib ${destroot}${prefix}/lib/libtbb.dylib"
-    system "install_name_tool -id ${prefix}/lib/libtbbmalloc.dylib ${destroot}${prefix}/lib/libtbbmalloc.dylib"
-
     # copy examples & docs
     xinstall -d ${destroot}${prefix}/share/${name}
     copy ${worksrcpath}/doc ${destroot}${prefix}/share/${name}/doc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140215/fccf17d0/attachment.html>