Revision: 117283 https://trac.macports.org/changeset/117283 Author: jeremyhu@macports.org Date: 2014-02-21 01:01:13 -0800 (Fri, 21 Feb 2014) Log Message: ----------- libcxx{,abi}: Don't use destroot.violate_mtree (#42385) Modified Paths: -------------- trunk/dports/lang/libcxx/Portfile trunk/dports/lang/libcxxabi/Portfile Modified: trunk/dports/lang/libcxx/Portfile =================================================================== --- trunk/dports/lang/libcxx/Portfile 2014-02-21 08:49:50 UTC (rev 117282) +++ trunk/dports/lang/libcxx/Portfile 2014-02-21 09:01:13 UTC (rev 117283) @@ -15,6 +15,7 @@ fetch.type svn svn.revision 183506 version ${svn.revision} +revision 1 #worksrcdir release_32 #svn.url http://llvm.org/svn/llvm-project/libcxx/branches/release_32 worksrcdir final @@ -25,6 +26,8 @@ variant universal {} use_configure no +set root_path ${prefix}/var/host/${name}-${version}-${revision} + if {${os.major} >= 11} { fetch {} build {} @@ -60,12 +63,15 @@ # Snow Leopard, this port provide this library in /usr for binary # compatibility with Lion and later. - destroot.violate_mtree yes destroot { - xinstall -m 755 -d ${destroot}/usr/lib - xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}/usr/lib - ln -s libc++.1.dylib ${destroot}/usr/lib/libc++.dylib + xinstall -m 755 -d ${destroot}${root_path}/usr/lib + xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${root_path}/usr/lib + ln -s libc++.1.dylib ${destroot}${root_path}/usr/lib/libc++.dylib } + + post-activate { + system "ditto ${root_path} /" + } } livecheck.type none Modified: trunk/dports/lang/libcxxabi/Portfile =================================================================== --- trunk/dports/lang/libcxxabi/Portfile 2014-02-21 08:49:50 UTC (rev 117282) +++ trunk/dports/lang/libcxxabi/Portfile 2014-02-21 09:01:13 UTC (rev 117283) @@ -16,9 +16,12 @@ fetch.type svn svn.revision 183506 version ${svn.revision} +revision 1 worksrcdir trunk svn.url http://llvm.org/svn/llvm-project/libcxxabi/trunk +set root_path ${prefix}/var/host/${name}-${version}-${revision} + variant universal {} use_configure no @@ -56,15 +59,18 @@ # Snow Leopard, this port provide this library in /usr for binary # compatibility with Lion and later. - destroot.violate_mtree yes destroot { - xinstall -m 755 -d ${destroot}/usr/lib - xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}/usr/lib + xinstall -m 755 -d ${destroot}${root_path}/usr/lib + xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}${root_path}/usr/lib - xinstall -m 755 -d ${destroot}/usr/include - xinstall -m 644 ${worksrcpath}/include/cxa_demangle.h ${destroot}/usr/include - xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}/usr/include + xinstall -m 755 -d ${destroot}${root_path}/usr/include + xinstall -m 644 ${worksrcpath}/include/cxa_demangle.h ${destroot}${root_path}/usr/include + xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}${root_path}/usr/include } + + post-activate { + system "ditto ${root_path} /" + } } livecheck.type none