diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /dev-lang/helium/files | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
Diffstat (limited to 'dev-lang/helium/files')
-rw-r--r-- | dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch | 59 | ||||
-rw-r--r-- | dev-lang/helium/files/helium-wrapper-1.6 | 31 |
2 files changed, 0 insertions, 90 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-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} $* |