[110308] trunk/dports/devel/cctools

[jeremyhu at macports.org]

Revision: 110308
          https://trac.macports.org/changeset/110308
Author:   jeremyhu at macports.org
Date:     2013-08-29 14:28:22 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
cctools: Fix some possible build failures

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

Added Paths:
-----------
    trunk/dports/devel/cctools/files/cctools-839-static-dis_info.patch

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2013-08-29 21:14:49 UTC (rev 110307)
+++ trunk/dports/devel/cctools/Portfile	2013-08-29 21:28:22 UTC (rev 110308)
@@ -27,7 +27,7 @@
 depends_lib             port:cctools-headers
 depends_build           port:ld64
 
-patchfiles              cctools-829-lto.patch PR-37520.patch
+patchfiles              cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
 
 variant universal {}
 
@@ -40,7 +40,7 @@
                         sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
     supported_archs     ppc i386 x86_64
 
-    patchfiles-delete   cctools-829-lto.patch PR-37520.patch
+    patchfiles-delete   cctools-829-lto.patch PR-37520.patch cctools-839-static-dis_info.patch
     patchfiles-append   cctools-806-lto.patch PR-9087924.patch PR-9830754.patch cctools-822-no-lto.patch PR-11136237.patch PR-12475288.patch
 } else {
     supported_archs     i386 x86_64
@@ -122,15 +122,15 @@
         RC_ProjectSourceVersion=${version} \
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
-        CC="${configure.cc}" \
-        CXX="${configure.cxx}" \
+        CC="${configure.cc} ${configure.cflags}" \
+        CXX="${configure.cxx} ${configure.cxxflags}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 
     if {${llvm_version} != ""} {
         build.args-append \
             LTO=-DLTO_SUPPORT \
-            RC_CFLAGS="[get_canonical_archflags] -I`llvm-config-mp-${llvm_version} --includedir`" \
+            RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
             LLVM_MC="llvm-mc-mp-${llvm_version}"
     } else {
         build.args-append \
@@ -152,8 +152,8 @@
         RC_ProjectSourceVersion=${version} \
         USE_DEPENDENCY_FILE=NO \
         BUILD_DYLIBS=NO \
-        CC="${configure.cc}" \
-        CXX="${configure.cxx}" \
+        CC="${configure.cc} ${configure.cflags}" \
+        CXX="${configure.cxx} ${configure.cxxflags}" \
         RC_ARCHS="[get_canonical_archs]" \
         SDK="-I${prefix}/include"
 

Added: trunk/dports/devel/cctools/files/cctools-839-static-dis_info.patch
===================================================================
--- trunk/dports/devel/cctools/files/cctools-839-static-dis_info.patch	                        (rev 0)
+++ trunk/dports/devel/cctools/files/cctools-839-static-dis_info.patch	2013-08-29 21:28:22 UTC (rev 110308)
@@ -0,0 +1,22 @@
+--- otool/arm_disasm.c.orig	2013-08-29 14:23:24.000000000 -0700
++++ otool/arm_disasm.c	2013-08-29 14:23:51.000000000 -0700
+@@ -62,7 +62,7 @@ typedef char bfd_byte;
+ 
+ /* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */
+ typedef int (*fprintf_ftype) (void *, const char*, ...);
+-struct disassemble_info { /* HACK'ed up for just what we need here */
++static struct disassemble_info { /* HACK'ed up for just what we need here */
+   fprintf_ftype fprintf_func;
+   void *stream;
+ 
+--- otool/i386_disasm.c.orig	2013-08-29 14:23:19.000000000 -0700
++++ otool/i386_disasm.c	2013-08-29 14:24:00.000000000 -0700
+@@ -1600,7 +1600,7 @@ static unsigned int xmm_rm(int r_m, int 
+ /*
+  * This is passed to the llvm disassembler.
+  */
+-struct disassemble_info {
++static struct disassemble_info {
+   enum bool verbose;
+   /* Relocation information.  */
+   struct relocation_info *sorted_relocs;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/3252cb4d/attachment.html>