[132862] trunk/dports/devel/cctools

[jeremyhu at macports.org]

Revision: 132862
          https://trac.macports.org/changeset/132862
Author:   jeremyhu at macports.org
Date:     2015-02-11 13:50:13 -0800 (Wed, 11 Feb 2015)
Log Message:
-----------
cctools: Fix a build failure if no llvm variant is selected

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

Added Paths:
-----------
    trunk/dports/devel/cctools/files/cctools-862-no-lto.patch

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2015-02-11 21:37:58 UTC (rev 132861)
+++ trunk/dports/devel/cctools/Portfile	2015-02-11 21:50:13 UTC (rev 132862)
@@ -32,7 +32,7 @@
 
 depends_build           port:libunwind-headers
 
-patchfiles              cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch
+patchfiles              cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch PR-12400897.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch cctools-862-no-lto.patch
 
 variant universal {}
 
@@ -48,7 +48,7 @@
                         rmd160  91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
 
-    patchfiles-delete   cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch
+    patchfiles-delete   cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch cctools-862-prunetrie.patch cctools-862-unifdef__DARWIN_UNIX03-arm.patch cctools-862-no-lto.patch
     patchfiles-append   cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch cctools-806-prunetrie.patch
 } else {
     if {${os.major} < 11} {

Added: trunk/dports/devel/cctools/files/cctools-862-no-lto.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-862-no-lto.patch	                        (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-862-no-lto.patch	2015-02-11 21:50:13 UTC (rev 132862)
@@ -0,0 +1,16 @@
+--- misc/libtool.c.orig	2014-11-01 22:48:10.000000000 -0700
++++ misc/libtool.c	2015-02-11 13:47:57.000000000 -0800
+@@ -1374,8 +1374,11 @@ void)
+ 			    }
+ 			}
+ 		    }
+-		    else if(ofiles[i].arch_type == OFILE_Mach_O ||
+-		            ofiles[i].arch_type == OFILE_LLVM_BITCODE){
++		    else if(ofiles[i].arch_type == OFILE_Mach_O
++#ifdef LTO_SUPPORT
++		            || ofiles[i].arch_type == OFILE_LLVM_BITCODE
++#endif
++                    ){
+ 			if(cmd_flags.ranlib == TRUE){
+ 			    error("for architecture: %s file: %s is not an "
+ 				  "archive (no processing done on this file)",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150211/85ee5e12/attachment.html>