Made compatible with gcc-3.4 and fixed a bug that caused the wrong set of libraries to be used by default (both bug #71183).

3 files changed, 54 insertions, 4 deletions

diff --git a/dev-lang/helium/files/digest-helium-1.2 b/dev-lang/helium/files/digest-helium-1.2-r1
index c3cf03e43437..c3cf03e43437 100644
--- a/dev-lang/helium/files/digest-helium-1.2
+++ b/dev-lang/helium/files/digest-helium-1.2-r1
diff --git a/dev-lang/helium/files/helium-1.2-libraries.patch b/dev-lang/helium/files/helium-1.2-libraries.patch
new file mode 100644
index 000000000000..8ee4aee6cf7a
--- /dev/null
+++ b/dev-lang/helium/files/helium-1.2-libraries.patch
@@ -0,0 +1,42 @@
+diff -Naur helium-1.2.orig/heliumNT/src/Makefile.in helium-1.2/heliumNT/src/Makefile.in
+--- helium-1.2.orig/heliumNT/src/Makefile.in	2004-11-18 12:37:28.025725408 +0100
++++ helium-1.2/heliumNT/src/Makefile.in	2004-11-18 12:39:54.000000000 +0100
+@@ -32,6 +32,7 @@
+ exec_prefix = @exec_prefix@

+ bindir      = @bindir@

+ libdir      = @prefix@/helium/lib

++tclibdir    = @prefix@/helium/tclib

+ demodir     = @prefix@/helium/demo

+ 

+ status :

+@@ -40,6 +41,8 @@
+ 	@echo "Type \"make install\" to install."

+ 	@echo "  Binaries will go into  $(bindir)"

+ 	@echo "  Libraries will go into $(libdir)"

++	@echo "  Libraries supporting type classes will go into"

++	@echo "                         $(tclibdir)"

+ 	@echo "  Demos will go into     $(demodir)"

+ 	@echo "*******************************************************************"

+ 

+@@ -432,15 +435,18 @@
+ install : smaller

+ 	# *** Copy sources to library directory

+-	$(MKDIR) $(bindir) $(libdir) $(demodir)

+-	$(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(libdir)

++	$(MKDIR) $(bindir) $(libdir) $(tclibdir) $(demodir)

++	$(INSTALL) -m 644 ../lib/simple/Prelude.hs ../lib/simple/List.hs ../lib/simple/Maybe.hs $(libdir)

++	$(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(tclibdir)

+ 	$(INSTALL) -m 755 $(HELIUMBINDIR)/$(MAIN)$(EXE) $(bindir)

+ 	$(INSTALL) -m 755 $(LVMRUNTIMEDIR)/lvmrun$(EXE) $(bindir)

+ 	$(INSTALL) -m 755 $(HELIUMBINDIR)/texthint$(EXE) $(bindir)

+ 	# *** Copying demos to demo directory

+ 	$(INSTALL) -m 644 ../demo/Calendar.hs ../demo/ParserLibrary.hs ../demo/ParserDemo.hs ../demo/TicTacToe.hs $(demodir)

+ 	# *** Copy generated lvms and touch them

+-	$(INSTALL) -m 644 ../lib/*.lvm $(libdir)

++	$(INSTALL) -m 644 ../lib/simple/*.lvm $(libdir)

++	$(INSTALL) -m 644 ../lib/*.lvm $(tclibdir)

+ 	touch $(libdir)/*.lvm

++	touch $(tclibdir)/*.lvm

+ 

+ movetohome: smaller

+ 	# *** Copying library sources to projects directory

diff --git a/dev-lang/helium/files/helium-wrapper b/dev-lang/helium/files/helium-wrapper
index e94e05e90d14..7bcd820e0b59 100644
--- a/dev-lang/helium/files/helium-wrapper
+++ b/dev-lang/helium/files/helium-wrapper
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-BINNAME="$(basename $0)"
+BINNAME_LONG="$(basename $0)"
+BINNAME="${BINNAME_LONG%-tc}"
 
 if [ -n "${HELIUM_TEMP}" ]; then
 	TEMP="${HELIUM_TEMP}";
@@ -10,15 +11,22 @@ else
 		mkdir ${TEMP};
 	fi;
 fi
+
+if [ "${BINNAME_LONG}" = "${BINNAME}" ]; then
+	HELIUM_LIBS="/usr/lib/helium/lib";
+else
+	HELIUM_LIBS="/usr/lib/helium/tclib";
+fi
+
 if [ -z "${LVMPATH}" ]; then
-	LVMPATH=".:/usr/lib/helium/lib";
+	LVMPATH=".:${HELIUM_LIBS}";
 else
-	LVMPATH="${LVMPATH}:/usr/lib/helium/lib";
+	LVMPATH="${LVMPATH}:${HELIUM_LIBS}";
 fi
 export LVMPATH
 export TEMP
 
-if [ x${BINNAME} = xhint ]; then
+if [ "${BINNAME}" = "hint" ]; then
 
 	JAVA="$(java-config --java)"
         PROGCALL="${JAVA} -jar -DPATH=${PATH} -DLVMPATH=${LVMPATH} /usr/share/helium/lib/Hint.jar"