misc/jvm-bridge.intelmac2.patch

   1 --- Haskell/Makefile.am 2006-09-02 23:50:38.000000000 -0700
   2 +++ Haskell/Makefile.am 2003-11-03 12:49:54.000000000 -0800
   3 @@ -3,7 +3,8 @@
   4
   5  JVMFILE                        = $(datadir)/current.jvm
   6
   7 +#HCPACKAGES            = -package lang -package concurrent
   8 +HCPACKAGES             = -package rts
   9 -HCPACKAGES             = -package lang -package concurrent
  10  HCIMPORTDIRS   = -i.
  11  HCCOPTS                        = -I$(includedir_FIX) $${JVM_INCLUDES}
  12  HCHOPTS                        = -fglasgow-exts -fallow-undecidable-instances -package-name $(GHCPACKAGENAME)
  13 @@ -15,7 +14,7 @@
  14
  15  CFLAGS                 = -I$(includedir_FIX) -I$(HC_INCDIR)
  16
  17 +BOOTLDFLAGS            = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation -framework JavaVM -optl -fexceptions  -lstdc++ -optl '-fexceptions'
  18 -BOOTLDFLAGS            = -L$(libdir_FIX)/ -lJVMBridge -lJVMInvocation `echo "$${JVM_LDFLAGS}" | sed -e 's/  */ -optl/g;s/^/-optl/'` -lstdc++
  19  BOOTLDFLAGS            += `(test -f $(libdir_FIX)/libjvm_imp.a && echo " -L$(libdir_FIX) -ljvm_imp ") || echo ""`
  20
  21  BOOT_SRCS = \
  22 diff -u ./MonadException.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/MonadException.hs
  23 --- Haskell/MonadException.hs   2006-09-02 23:42:19.000000000 -0700
  24 +++ Haskell/MonadException.hs   2002-01-28 18:21:35.000000000 -0800
  25 @@ -20,7 +20,7 @@
  26
  27  module MonadException where
  28         {
  29 +       import Control.Exception as Exception;
  30 -       import Exception;
  31
  32         -- much like MonadError, but without the fundep
  33         class (Monad m) => MonadException ex m where
  34 diff -u ./TypedCallback.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedCallback.hs
  35 --- Haskell/TypedCallback.hs    2006-09-02 23:43:13.000000000 -0700
  36 +++ Haskell/TypedCallback.hs    2002-08-05 17:27:04.000000000 -0700
  37 @@ -33,8 +33,8 @@
  38         import VMLayer;
  39         import JavaLayer;
  40         import BasicLayer;
  41 +       import Control.Concurrent as Concurrent;
  42 +       import Control.Exception as Exception;
  43 -       import Concurrent;
  44 -       import Exception;
  45
  46  {--
  47         data CallbackClass t = MkCallbackClass JClass;
  48 diff -u ./TypedLayer.hs ../../haskell-jvm-bridge-0.3.RC1/Haskell/TypedLayer.hs
  49 --- Haskell/TypedLayer.hs       2006-09-02 23:44:06.000000000 -0700
  50 +++ Haskell/TypedLayer.hs       2002-01-28 18:21:35.000000000 -0800
  51 @@ -60,7 +60,7 @@
  52         import VMLayer;
  53         import JavaLayer;
  54         import BasicLayer;
  55 +       import Control.Monad.Error;
  56 -       import MonadError;
  57
  58         runJavaClass :: (IsJVMMonad m) => ClassName -> [JString] -> m ();
  59         runJavaClass className args = do