X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=patches%2Fpatch-aa;h=14b0424f6720df4fe99d2f44faf21dc75ec920cd;hp=98027dd652c074c1d336fa48b41adc3ae83f1fd5;hb=581794b5a3b8c50fa6fe25325b8c59a96a89fa41;hpb=40ea93f22a6b5c7187c9ddd7e6b17987d8687abc

diff --git a/patches/patch-aa b/patches/patch-aa
index 98027dd..14b0424 100644
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,48 +1,15 @@
 $NetBSD$
 
---- ../ghc-6.6.1/mk/bootstrap.mk.orig	2007-04-26 02:10:40.000000000 +0900
-+++ ../ghc-6.6.1/mk/bootstrap.mk
-@@ -30,7 +30,6 @@ PLATFORM_CC_OPTS += -D_HPUX_SOURCE
- endif
+--- rts/ghc.mk.orig	2009-12-11 03:11:33.000000000 +0900
++++ rts/ghc.mk
+@@ -19,8 +19,8 @@ rts_dist_HC = $(GHC_STAGE1)
+ # merge GhcLibWays and GhcRTSWays but strip out duplicates
+ rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
+ 
+-ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \
+-	       rts/dist/build/libHSrtsmain.a
++ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
++
+ all_rts : $(ALL_RTS_LIBS)
  
- ifeq "$(powerpc_TARGET_ARCH)" "1"
--PLATFORM_CC_OPTS += -static
- PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive
- endif
- 
-@@ -68,10 +67,6 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/$(GH
- # yet, so we use lazy expansion.
- SRC_CC_OPTS += $(if $(findstring YES,$(UseGhcForCc)), $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS))
- 
--ifeq "$(GhcWithInterpreter)" "YES"
--SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/libraries/readline/include
--endif
--
  # -----------------------------------------------------------------------------
- # Linking: we have to give all the libraries explicitly.
- 
-@@ -100,7 +95,6 @@ HC_BOOT_LD_OPTS =				\
- ifeq "$(GhcWithInterpreter)" "YES"
- HC_BOOT_LD_OPTS += \
-    -L$(FPTOOLS_TOP_ABS)/libraries/template-haskell	\
--   -L$(FPTOOLS_TOP_ABS)/libraries/readline	\
-    -L$(FPTOOLS_TOP_ABS)/libraries/unix          \
-    -L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
- endif
-@@ -135,14 +129,12 @@ HC_BOOT_LD_OPTS += \
-    -u "$(UNDERSCORE)base_GHCziIOBase_NonTermination_closure" \
-    -u "$(UNDERSCORE)base_GHCziIOBase_BlockedOnDeadMVar_closure" \
-    -u "$(UNDERSCORE)base_GHCziIOBase_Deadlock_closure" \
--   -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure" \
--   -u "$(UNDERSCORE)__stginit_Prelude"
--
-+   -u "$(UNDERSCORE)base_GHCziWeak_runFinalizzerBatch_closure"
- 
- HC_BOOT_LIBS =
- 
- ifeq "$(GhcWithInterpreter)" "YES"
--HC_BOOT_LIBS += -lHSreadline -lreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits
-+HC_BOOT_LIBS += -lHStemplate-haskell -lHSunix -lHSunix_cbits
- endif
- 
- HC_BOOT_LIBS +=  -lHSCabal -lHShaskell98 -lHSregex-compat -lHSregex-posix -lHSregex-base -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)