summaryrefslogtreecommitdiff
path: root/dev-lang/helium/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/helium/files')
-rw-r--r--dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch59
-rw-r--r--dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch55
-rw-r--r--dev-lang/helium/files/helium-wrapper-1.631
3 files changed, 0 insertions, 145 deletions
diff --git a/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch b/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
deleted file mode 100644
index 6c035ad3b8fc..000000000000
--- a/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Original report: https://bugs.gentoo.org/attachment.cgi?id=244509
-
-The patch is not ideal as lvm/src/configure runs
-compiler tests without those flags enabled, but
-they are broken anyways.
-
-Added CFLAGS, LDFLAGS, remover STRIP call in C part of lvm.
-diff --git a/lvm/src/configure b/lvm/src/configure
-index 9aa1a1d..2789828 100755
---- a/helium-1.6/lvm/src/configure
-+++ b/helium-1.6/lvm/src/configure
-@@ -647,7 +647,7 @@ fi
- echo "CC=$ccomp" >> makefile
- echo "LINK=$link" >> makefile
- echo "STRIP=$strip" >> makefile
--echo "LINKOPTS=$cclinkopts" >> makefile
-+echo "LINKOPTS=$cclinkopts \$(LDFLAGS)" >> makefile
- echo "EXE=$exe" >> makefile
- echo "DLL=$dll" >> makefile
- echo "CP=cp" >> makefile
-@@ -662,7 +662,7 @@ case "$config" in
- echo "CONFIGPATH=../config" >> makefile;;
- esac
-
--echo "CCOPTS=$cccompopts -I\$(CONFIGPATH)" >> makefile
-+echo "CCOPTS=$cccompopts -I\$(CONFIGPATH) \$(CFLAGS)" >> makefile
-
- rm -f tst$exe hasgot.c *.obj
-
-diff --git a/lvm/src/lib/makefile b/lvm/src/lib/makefile
-index d9a0004..78cce0f 100644
---- a/helium-1.6/lvm/src/lib/makefile
-+++ b/helium-1.6/lvm/src/lib/makefile
-@@ -55,7 +55,6 @@ OBJS = $(SRCS:.hs=.o)
- # The main target
- $(MAIN)$(EXE): $(OBJS)
- $(HC) -o $@ $(HC_OPTS) $(OBJS)
-- $(STRIP) $@
-
- common/ghc/Special.hi: common/ghc/Special.hs
- $(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS)
-diff --git a/lvm/src/runtime/makefile b/lvm/src/runtime/makefile
-index 310a7b6..bde3550 100644
---- a/helium-1.6/lvm/src/runtime/makefile
-+++ b/helium-1.6/lvm/src/runtime/makefile
-@@ -47,11 +47,10 @@ OBJS = $(SRCS:.c=.o)
-
-
- #lvmrun$(EXE): $(OBJS)
--# $(LINK) -o $@ $(LINKOPT) $(OBJS) -g
-+# $(LINK) -o $@ $(OBJS) -g $(LINKOPT)
-
- lvmrun$(EXE): $(OBJS)
-- $(LINK) -o $@ $(LINKOPT) $(OBJS)
-- $(STRIP) $@
-+ $(LINK) -o $@ $(OBJS) $(LINKOPT)
-
- core/evaluator.o: core/evaluator.c
- $(CC) -o $@ -c $< $(CCOPT_FAST)
diff --git a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch
deleted file mode 100644
index 43af33ecac89..000000000000
--- a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs
-index 75ac077..af35093 100644
---- a/src/Helium/Parser/LexerMonad.hs
-+++ b/src/Helium/Parser/LexerMonad.hs
-@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage
- import Text.ParserCombinators.Parsec.Pos
-+import Control.Applicative
-+import Control.Monad
-
-@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets))
-
-+instance Functor LexerMonad where
-+ fmap = liftM
-+
-+instance Applicative LexerMonad where
-+ pure = return
-+ (<*>) = ap -- defined in Control.Monad
-+
- instance Monad LexerMonad where
-diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
-index 880ac0b..90574f0 100644
---- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
-+++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| Module : OnlyResultHeuristics
-diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
-index 89e43f2..251406f 100644
---- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
-+++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| Module : RepairHeuristics
-diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
-index d0b01a3..ba7ca19 100644
---- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
-+++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| Module : TieBreakerHeuristics
-diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
-index c2e91f5..493c882 100644
---- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
-+++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| Module : UnifierHeuristics
-diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs
-index af970dc..ee42a48 100644
---- a/src/Helium/Syntax/UHA_Pretty.hs
-+++ b/src/Helium/Syntax/UHA_Pretty.hs
-@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity)
- import qualified Control.Monad.Identity
-+import Prelude hiding ((<$>))
-
diff --git a/dev-lang/helium/files/helium-wrapper-1.6 b/dev-lang/helium/files/helium-wrapper-1.6
deleted file mode 100644
index 926e18cc6171..000000000000
--- a/dev-lang/helium/files/helium-wrapper-1.6
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-BINNAME_LONG="$(basename $0)"
-BINNAME="${BINNAME_LONG%-tc}"
-
-if [ -n "${HELIUM_TEMP}" ]; then
- TEMP="${HELIUM_TEMP}";
-else
- TEMP="/tmp/helium-${USER}"
- if ! [ -d "${TEMP}" ]; then
- mkdir ${TEMP};
- fi;
-fi
-
-# if [ "${BINNAME_LONG}" = "${BINNAME}" ]; then
-# HELIUM_LIBS="/usr/lib/helium/lib/simple";
-# else
-HELIUM_LIBS="/usr/lib/helium/lib";
-# fi
-
-if [ -z "${LVMPATH}" ]; then
- LVMPATH=".:${HELIUM_LIBS}";
-else
- LVMPATH="${LVMPATH}:${HELIUM_LIBS}";
-fi
-export LVMPATH
-export TEMP
-
-PROGCALL="/usr/lib/helium/bin/${BINNAME}"
-
-${PROGCALL} $*