[122079] trunk/dports/devel/libffi

[jeremyhu at macports.org]

Revision: 122079
          https://trac.macports.org/changeset/122079
Author:   jeremyhu at macports.org
Date:     2014-07-14 01:43:12 -0700 (Mon, 14 Jul 2014)
Log Message:
-----------
libffi: Really address #44170 now

Modified Paths:
--------------
    trunk/dports/devel/libffi/Portfile
    trunk/dports/devel/libffi/files/PR-44170.patch

Added Paths:
-----------
    trunk/dports/devel/libffi/files/

Modified: trunk/dports/devel/libffi/Portfile
===================================================================
--- trunk/dports/devel/libffi/Portfile	2014-07-14 08:34:57 UTC (rev 122078)
+++ trunk/dports/devel/libffi/Portfile	2014-07-14 08:43:12 UTC (rev 122079)
@@ -2,11 +2,10 @@
 
 PortSystem 1.0
 PortGroup  muniversal 1.0
-PortGroup  compiler_blacklist_versions 1.0
 
 name                libffi
 version             3.1
-revision            2
+revision            3
 categories          devel
 platforms           darwin
 license             MIT
@@ -35,11 +34,14 @@
 checksums           rmd160  2445ad6cf9cf42adbd29b9ced4cd29f252864ec5 \
                     sha256  97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb
 
-# unknown:missing indirect symbols for section (__IMPORT,__jump_table)
-compiler.blacklist-append *gcc-3.3 *gcc-4.0 *gcc-4.2 {clang < 100}
+# https://trac.macports.org/ticket/44170
+patchfiles-append PR-44170.patch
 
-# clang depends on libffi; circular dependencies are not allowed
-compiler.blacklist-append macports-clang-*
+# Older versions of cctools have a history of being problematic with complex
+# asm like libffi has, so opt for the integrated assembler if it's available
+if {[string match *clang* ${configure.compiler}]} {
+    configure.cflags-append -integrated-as
+}
 
 array set merger_host {
     ppc64   powerpc-apple-darwin

Modified: trunk/dports/devel/libffi/files/PR-44170.patch
===================================================================
--- trunk/dports/devel/libffi/files/PR-44170.patch	2014-07-14 08:15:10 UTC (rev 122076)
+++ trunk/dports/devel/libffi/files/PR-44170.patch	2014-07-14 08:43:12 UTC (rev 122079)
@@ -1,14 +1,18 @@
-https://trac.macports.org/ticket/44170
-https://github.com/atgreen/libffi/issues/128
-
---- src/x86/win32.S.orig	2014-04-25 10:45:13.000000000 -0700
-+++ src/x86/win32.S	2014-07-14 00:49:27.000000000 -0700
-@@ -1140,7 +1140,7 @@ L_ffi_closure_SYSV_inner$stub:
- 	hlt ; hlt ; hlt ; hlt ; hlt
- #endif
+--- src/x86/win32.S.orig	2014-07-14 01:38:25.000000000 -0700
++++ src/x86/win32.S	2014-07-14 01:40:23.000000000 -0700
+@@ -1142,7 +1142,6 @@ L_ffi_closure_SYSV_inner$stub:
  
--#if defined(X86_WIN32) && !defined(__OS2__)
-+#if (defined(X86_DARWIN) || defined(X86_WIN32)) && !defined(__OS2__)
+ #if defined(X86_WIN32) && !defined(__OS2__)
  	.section	.eh_frame,"w"
- #endif
+-#endif
  .Lframe1:
+ .LSCIE1:
+ 	.long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
+@@ -1301,6 +1300,7 @@ L_ffi_closure_SYSV_inner$stub:
+ 	/* End of DW_CFA_xxx CFI instructions.  */
+ 	.align 4
+ .LEFDE5:
++#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
+ 
+ #endif /* !_MSC_VER */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140714/f0e73abc/attachment-0001.html>