diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-02-17 17:22:43 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-02-17 17:22:43 +0000 |
| commit | 749fccb9ee7671f4cac13709534de2e5b1c5b6d5 (patch) | |
| tree | 8b0954324b9237f698104dde2cc0a6bcc7b3ddeb /lang/ghc80/patches | |
| parent | 3c8972055e0f1ea743abd5e9dd6caa02360065bf (diff) | |
| download | pkgsrc-749fccb9ee7671f4cac13709534de2e5b1c5b6d5.tar.gz | |
ghc80: Support SunOS/x86_64.
Diffstat (limited to 'lang/ghc80/patches')
| -rw-r--r-- | lang/ghc80/patches/patch-configure.ac | 13 | ||||
| -rw-r--r-- | lang/ghc80/patches/patch-rules_distdir-way-opts.mk | 17 |
2 files changed, 28 insertions, 2 deletions
diff --git a/lang/ghc80/patches/patch-configure.ac b/lang/ghc80/patches/patch-configure.ac index eda4a63d53b..212170b8b40 100644 --- a/lang/ghc80/patches/patch-configure.ac +++ b/lang/ghc80/patches/patch-configure.ac @@ -1,10 +1,19 @@ -$NetBSD: patch-configure.ac,v 1.1 2020/01/14 08:46:17 pho Exp $ +$NetBSD: patch-configure.ac,v 1.2 2020/02/17 17:22:43 jperkin Exp $ Fix build on FreeBSD/amd64. --- configure.ac.orig 2017-01-04 14:17:17.000000000 +0000 +++ configure.ac -@@ -1060,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then +@@ -732,7 +732,7 @@ dnl ** check for dtrace (currently only + HaveDtrace=NO + AC_PATH_PROG(DtraceCmd,dtrace) + if test -n "$DtraceCmd"; then +- if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then ++ if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then + HaveDtrace=YES + fi + fi +@@ -1060,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t # The flag MAP_NORESERVE is supported for source compatibility reasons, # but is completely ignored by OS mmap use_large_address_space=no diff --git a/lang/ghc80/patches/patch-rules_distdir-way-opts.mk b/lang/ghc80/patches/patch-rules_distdir-way-opts.mk new file mode 100644 index 00000000000..8451705f661 --- /dev/null +++ b/lang/ghc80/patches/patch-rules_distdir-way-opts.mk @@ -0,0 +1,17 @@ +$NetBSD: patch-rules_distdir-way-opts.mk,v 1.1 2020/02/17 17:22:43 jperkin Exp $ + +https://gitlab.haskell.org/ghc/ghc/issues/17385 + +--- rules/distdir-way-opts.mk.orig 2017-01-04 04:04:11.000000000 +0000 ++++ rules/distdir-way-opts.mk +@@ -196,8 +196,8 @@ $1_$2_$3_ALL_LD_OPTS = \ + $$($1_$2_$3_LD_OPTS) \ + $$($1_$2_EXTRA_LD_OPTS) \ + $$(EXTRA_LD_OPTS) \ +- $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-optl-Wl$$(comma)$$o) \ +- $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-optl-Wl$$(comma)$$o) ++ $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-Wl$$(comma)$$o) \ ++ $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-Wl$$(comma)$$o) + + # Options for passing to GHC when we use it for linking + $1_$2_$3_GHC_LD_OPTS = \ |