Ticket #54289: lcxx+runtime.diff

lang/libcxx/Portfile

@@ -14 +14 @@
                         replace the host version in order to be used.  On Snow Leopard and earlier, this is done \
                         automatically because there is no existing host version of this library.  On Lion and later, \
                         users must build the port with +replacemnt_libcxx and install the root manually if they wish \
-                        to replace the existing host implementation.
+                        to replace the existing host implementation. They can also use the +runtime variant which installs \
+                        copies of the library that can be loaded via DYLD_INSERT_LIBRARIES or the optlibs script\; \
+                        applications started that way will then use a more recent libc++ than the host provides.
 
 homepage                http://libcxx.llvm.org/
 
@@ -50 +52 @@
 }
 
 variant replacemnt_libcxx description {EXPERTS ONLY: Build a replacement libcxxabi and libcxx even if it is already part of the base OS.} {}
+variant runtime description "Install the libcxx library so that it can be used with DYLD_INSERT_LIBRARIES" {
+    depends_build-append \
+                        port:cctools
+}
+
 
-if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
+if {${os.major} < 11 || [variant_isset replacemnt_libcxx] || [variant_isset runtime]} {
     compiler.blacklist *gcc* {clang < 500}
 
     # clang 3.5 and newer are blacklisted to prevent dependency cycles
@@ -98 +107 @@
     # runtime.
 
     destroot {
-        xinstall -m 755 -d ${destroot}${roots_path}/${root_name}/usr/lib
-        xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib
-        ln -s libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib/libc++.dylib
+        if {[variant_isset replacemnt_libcxx]} {
+            xinstall -m 755 -d ${destroot}${roots_path}/${root_name}/usr/lib
+            xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib
+            ln -s libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib/libc++.dylib
 
-        system "cd ${destroot}${roots_path}/${root_name} && tar czf ../${root_name}.tgz ."
-        file delete -force ${destroot}${roots_path}/${root_name}
+            system "cd ${destroot}${roots_path}/${root_name} && tar czf ../${root_name}.tgz ."
+            file delete -force ${destroot}${roots_path}/${root_name}
+        }
+        if {[variant_isset runtime]} {
+            # install only the runtime library so it will not be picked up by the linker/editor!
+            xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${prefix}/lib/
+            system "install_name_tool -id ${prefix}/lib/libc++.1.dylib ${destroot}${prefix}/lib/libc++.1.dylib"
+            xinstall -m 755 ${filespath}/optlibs.sh ${destroot}${prefix}/bin/optlibs
+            reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${prefix}/bin/optlibs
+        }
     }
 } else {
     distfiles