Ticket #31777: macports.openjade.noclang.universal.diff

Portfile

@@ -31 +31 @@
 depends_lib     port:opensp
 depends_run     port:xmlcatmgr
 
+# XCode 4.2's clang doesn't like openjade, but llvm-gcc-4.2 builds it just fine
+if {${configure.compiler} == "clang"} {
+    configure.compiler llvm-gcc-4.2
+}
+
 # xmlcatmgr as installed by MacPorts defaults to using
 # ${prefix}/etc/sgml/catalog (for XML) and ${prefix}/etc/sgml/catalog (for
 # SGML). For historic reasons, openjade expects the catalog to be in
@@ -60 +65 @@
     reinplace "s|^#pragma interface||g" ${worksrcpath}/grove/Node.h
     reinplace "s|^#pragma interface||g" ${worksrcpath}/msggen.pl
     reinplace "s|^#pragma interface||g" ${worksrcpath}/spgrove/GroveApp.h
-    reinplace "s|CXX=|CXX=${configure.cxx}|g" ${worksrcpath}/libtool
+
+    # To make universal builds work, libtool needs to pass the required
+    # "-arch ... " flags to gcc/g++. configure, however, doesn't know
+    # that, so we patch the generated libtool script after configure has
+    # run
+    reinplace "s|^CXX=.*$|CXX='${configure.cxx} [get_canonical_archflags]'|g" ${worksrcpath}/libtool
+    reinplace "s|^CC=.*$|CC='${configure.cc} [get_canonical_archflags]'|g" ${worksrcpath}/libtool
 }
 
 destroot.target install install-man