[113404] trunk/dports/lang
cal at macports.org
cal at macports.org
Fri Nov 15 08:07:19 PST 2013
Revision: 113404
https://trac.macports.org/changeset/113404
Author: cal at macports.org
Date: 2013-11-15 08:07:18 -0800 (Fri, 15 Nov 2013)
Log Message:
-----------
ghc: fix build on Mavericks, closes #40950
Modified Paths:
--------------
trunk/dports/lang/ghc/Portfile
trunk/dports/lang/ghc-bootstrap/Portfile
Added Paths:
-----------
trunk/dports/lang/ghc/files/patch-includes_HsFFI.h.diff
trunk/dports/lang/ghc/files/patch-utils__mkdirhier__mkdirhier.sh.diff
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2013-11-15 15:55:36 UTC (rev 113403)
+++ trunk/dports/lang/ghc/Portfile 2013-11-15 16:07:18 UTC (rev 113404)
@@ -2,6 +2,7 @@
# $Id$
PortSystem 1.0
+PortGroup active_variants 1.1
name ghc
set canonicalname ghc
@@ -52,7 +53,9 @@
port:ncurses \
port:libiconv
-patchfiles patch-configure-disable-docbook-ps-and-pdf.diff
+patchfiles patch-configure-disable-docbook-ps-and-pdf.diff \
+ patch-utils__mkdirhier__mkdirhier.sh.diff \
+ patch-includes_HsFFI.h.diff
livecheck.type none
@@ -64,36 +67,43 @@
variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.3} {
configure.compiler macports-gcc-4.3
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc43
}
variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.4} {
configure.compiler macports-gcc-4.4
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc44
}
variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.5} {
configure.compiler macports-gcc-4.5
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc45
}
variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 gcc49 description {Compile with gcc 4.6} {
configure.compiler macports-gcc-4.6
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc46
}
variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 gcc49 description {Compile with gcc 4.7} {
configure.compiler macports-gcc-4.7
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc47
}
variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc49 description {Compile with gcc 4.8} {
configure.compiler macports-gcc-4.8
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc48
}
variant gcc49 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 description {Compile with gcc 4.9} {
configure.compiler macports-gcc-4.9
configure.args-append --with-gcc=${configure.cc}
+ require_active_variants ghc-bootstrap gcc49
}
if {![variant_isset gcc43] && ![variant_isset gcc44] &&
Added: trunk/dports/lang/ghc/files/patch-includes_HsFFI.h.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-includes_HsFFI.h.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-includes_HsFFI.h.diff 2013-11-15 16:07:18 UTC (rev 113404)
@@ -0,0 +1,31 @@
+diff --git includes/HsFFI.h includes/HsFFI.h
+index 652fbea..a21811e 100644
+--- includes/HsFFI.h
++++ includes/HsFFI.h
+@@ -21,7 +21,7 @@ extern "C" {
+ #include "stg/Types.h"
+
+ /* get limits for integral types */
+-#ifdef HAVE_STDINT_H
++#if defined HAVE_STDINT_H && !defined USE_INTTYPES_H_FOR_RTS_PROBES_D
+ /* ISO C 99 says:
+ * "C++ implementations should define these macros only when
+ * __STDC_LIMIT_MACROS is defined before <stdint.h> is included."
+diff --git rts/RtsProbes.d rts/RtsProbes.d
+index 13f40f8..226f881 100644
+--- rts/RtsProbes.d
++++ rts/RtsProbes.d
+@@ -6,6 +6,12 @@
+ *
+ * ---------------------------------------------------------------------------*/
+
++#ifdef __APPLE__ && __MACH__
++# if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
++# define USE_INTTYPES_H_FOR_RTS_PROBES_D
++# endif
++#endif
++
+ #include "HsFFI.h"
+ #include "rts/EventLogFormat.h"
+
+
Added: trunk/dports/lang/ghc/files/patch-utils__mkdirhier__mkdirhier.sh.diff
===================================================================
--- trunk/dports/lang/ghc/files/patch-utils__mkdirhier__mkdirhier.sh.diff (rev 0)
+++ trunk/dports/lang/ghc/files/patch-utils__mkdirhier__mkdirhier.sh.diff 2013-11-15 16:07:18 UTC (rev 113404)
@@ -0,0 +1,8 @@
+--- utils/mkdirhier/mkdirhier.sh.orig 2013-11-14 21:57:42.000000000 +0100
++++ utils/mkdirhier/mkdirhier.sh 2013-11-14 21:57:49.000000000 +0100
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+
+-mkdir -p ${1+"$@"}
++mkdir -p ${1+"./$@"}
+
Modified: trunk/dports/lang/ghc-bootstrap/Portfile
===================================================================
--- trunk/dports/lang/ghc-bootstrap/Portfile 2013-11-15 15:55:36 UTC (rev 113403)
+++ trunk/dports/lang/ghc-bootstrap/Portfile 2013-11-15 16:07:18 UTC (rev 113404)
@@ -6,6 +6,7 @@
name ghc-bootstrap
set canonicalname ghc
version 7.0.4
+revision 1
categories lang haskell
maintainers gmail.com:kitchen.andy cal openmaintainer
license BSD
@@ -32,6 +33,44 @@
rmd160 14f4c6a044eaa3d04f1645324f9255eebff9a49d \
sha256 74580b919b5205007901d15da88635e4b2dcc887086fb16d238eeb7011a255d4
+# -- BEGIN gcc variants
+
+variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.3} {
+ configure.compiler macports-gcc-4.3
+}
+
+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.4} {
+ configure.compiler macports-gcc-4.4
+}
+
+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 gcc49 description {Compile with gcc 4.5} {
+ configure.compiler macports-gcc-4.5
+}
+
+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 gcc49 description {Compile with gcc 4.6} {
+ configure.compiler macports-gcc-4.6
+}
+
+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 gcc49 description {Compile with gcc 4.7} {
+ configure.compiler macports-gcc-4.7
+}
+
+variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc49 description {Compile with gcc 4.8} {
+ configure.compiler macports-gcc-4.8
+}
+
+variant gcc49 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 description {Compile with gcc 4.9} {
+ configure.compiler macports-gcc-4.9
+}
+
+if {![variant_isset gcc43] && ![variant_isset gcc44] &&
+ ![variant_isset gcc45] && ![variant_isset gcc46] &&
+ ![variant_isset gcc47] && ![variant_isset gcc49]} {
+ default_variants +gcc48
+}
+
+# -- END gcc variants
+
configure.pre_args --prefix=${prefix}/share/ghc-bootstrap
pre-configure {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131115/4d1512af/attachment.html>
More information about the macports-changes
mailing list