[138532] trunk/dports/lang/ghc/Portfile

[cal at macports.org]

Revision: 138532
          https://trac.macports.org/changeset/138532
Author:   cal at macports.org
Date:     2015-07-11 05:01:16 -0700 (Sat, 11 Jul 2015)
Log Message:
-----------
ghc: use system libffi, fix comments on compiler.cpath/library_path, closes #48224

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

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2015-07-11 11:35:44 UTC (rev 138531)
+++ trunk/dports/lang/ghc/Portfile	2015-07-11 12:01:16 UTC (rev 138532)
@@ -9,7 +9,7 @@
 # When updating GHC, make sure to revbump all Haskell ports.
 # Also make sure to update the version in the Haskell PortGroup.
 version             7.8.3
-revision            2
+revision            3
 categories          lang haskell
 maintainers         gmail.com:kitchen.andy cal openmaintainer
 license             BSD
@@ -52,7 +52,8 @@
 depends_lib     port:gmp           \
                 port:ncurses       \
                 port:libiconv      \
-                port:llvm-3.5
+                port:llvm-3.5       \
+                port:libffi
 
 patchfiles      patch-configure-workaround-bsdsed-incompatibility.diff \
                 patch-configure-disable-docs.diff \
@@ -78,20 +79,22 @@
 
 set bootstraproot ${prefix}/share/ghc-bootstrap
 set llvmPrefix  ${prefix}/libexec/llvm-3.5
-configure.args  --with-ghc=${bootstraproot}/bin/ghc     \
+configure.args  --with-ghc=${bootstraproot}/bin/ghc \
                 --with-iconv-includes=${prefix}/include \
-                --with-iconv-libraries=${prefix}/lib    \
-                --with-gmp-includes=${prefix}/include   \
-                --with-gmp-libraries=${prefix}/lib      \
-                --with-gcc="${configure.cc}"            \
-                --with-llc=${llvmPrefix}/bin/llc        \
+                --with-iconv-libraries=${prefix}/lib \
+                --with-gmp-includes=${prefix}/include \
+                --with-gmp-libraries=${prefix}/lib \
+                --with-ffi-includes=${prefix}/lib/libffi-3.2.1/include \
+                --with-ffi-libraries=${prefix}/lib \
+                --with-system-libffi \
+                --with-gcc="${configure.cc}" \
+                --with-llc=${llvmPrefix}/bin/llc \
                 --with-opt=${llvmPrefix}/bin/opt
 
-
-# OK so because the bootstrap binary has been prebuilt for libraries
-# in /usr/lib we search these before macports stuff to prevent
-# link errors, ghc _should_ actually compile itself in stage2
-# using paths from the command line arguments
+# OK so because the bootstrap binary has been prebuilt for libraries in
+# /usr/lib we search these in addition to MacPorts' paths to prevent link
+# errors. GHC _should_ actually compile itself in stage2 using paths from the
+# command line arguments
 compiler.cpath /usr/include
 compiler.library_path /usr/lib
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150711/e69615dd/attachment-0001.html>