[90576] trunk/dports/lang/pure

[ryandesign at macports.org]

Revision: 90576
          http://trac.macports.org/changeset/90576
Author:   ryandesign at macports.org
Date:     2012-03-08 22:34:53 -0800 (Thu, 08 Mar 2012)
Log Message:
-----------
pure: fix 'pure -c' by calling opt and llc by their full names as they're installed by llvm-3.0 (see http://groups.google.com/group/pure-lang/browse_thread/thread/65e6c3ce414f2e68); also pass -disable-cfi to llc (see http://old.nabble.com/llvm-3.0-svn-and-cfi_*-directives-td32169409.html)

Modified Paths:
--------------
    trunk/dports/lang/pure/Portfile

Added Paths:
-----------
    trunk/dports/lang/pure/files/patch-interpreter.cc.diff

Modified: trunk/dports/lang/pure/Portfile
===================================================================
--- trunk/dports/lang/pure/Portfile	2012-03-09 06:00:54 UTC (rev 90575)
+++ trunk/dports/lang/pure/Portfile	2012-03-09 06:34:53 UTC (rev 90576)
@@ -37,6 +37,8 @@
 configure.env           PATH=${llvm_path}/bin:$env(PATH)
 
 if {${name} == ${subport}} {
+    revision                    1
+    
     depends_lib                 port:gmp \
                                 port:libiconv \
                                 port:libtool \
@@ -46,6 +48,12 @@
     
     depends_run                 path:bin/w3m:w3m
     
+    patchfiles                  patch-interpreter.cc.diff
+    
+    post-patch {
+        reinplace "s|@LLVM_VERSION@|${llvm_version}|g" ${worksrcpath}/interpreter.cc
+    }
+    
     # llvm-${llvm_version} is not universal
     universal_variant           no
     

Added: trunk/dports/lang/pure/files/patch-interpreter.cc.diff
===================================================================
--- trunk/dports/lang/pure/files/patch-interpreter.cc.diff	                        (rev 0)
+++ trunk/dports/lang/pure/files/patch-interpreter.cc.diff	2012-03-09 06:34:53 UTC (rev 90576)
@@ -0,0 +1,13 @@
+--- interpreter.cc.orig	2011-12-21 11:32:08.000000000 -0600
++++ interpreter.cc	2012-03-09 00:10:36.000000000 -0600
+@@ -10531,8 +10531,8 @@
+     /* Call llc (and opt) to create a native assembler file which can then be
+        passed to gcc to handle assembly and linkage (if requested). */
+     string asmfile = (ext==".s")?out:out+".s";
+-    string cmd = "opt -f -std-compile-opts "+quote(target)+
+-      " | llc "+string(pic?"-relocation-model=pic ":"")+
++    string cmd = "opt-mp- at LLVM_VERSION@ -f -std-compile-opts "+quote(target)+
++      " | llc-mp- at LLVM_VERSION@ -disable-cfi "+string(pic?"-relocation-model=pic ":"")+
+       "-o "+quote(asmfile);
+     if (vflag) std::cerr << cmd << '\n';
+     unlink(asmfile.c_str());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120308/88365b44/attachment.html>