(lang/ghc) I believe it went a litte bit further

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Tue Oct 8 22:07:16 2019 +0900
Changeset:	9e7466d29ad992cd2f6c64b1d8b54ac7471b165e

Modified Files:
	ghc68/Makefile
	ghc68/TODO
	ghc68/distinfo
	ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c

Log Message:
(lang/ghc) I believe it went a litte bit further

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9e7466d29ad992cd2f6c64b1d8b54ac7471b165e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ghc68/Makefile                                 |  3 +--
 ghc68/TODO                                     | 22 +++++++++++++++++++---
 ghc68/distinfo                                 |  3 ++-
 ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c |  2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)

diffs:
diff --git a/ghc68/Makefile b/ghc68/Makefile
index 97fe815369..cb96199ab5 100644
--- a/ghc68/Makefile
+++ b/ghc68/Makefile
@@ -28,8 +28,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ghc=${WRKDIR}/ghc-6.4.2/ghc/compiler/ghc-inplace
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 USE_TOOLS+=		gmake perl:run
-LDFLAGS+=		-L${PREFIX}/lib -lgmp
-MAKE_JOBS_SAFE=		no
+#LDFLAGS+=		-L${PREFIX}/lib -lgmp
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
diff --git a/ghc68/TODO b/ghc68/TODO
index 362dc45ac2..f11e904c7e 100644
--- a/ghc68/TODO
+++ b/ghc68/TODO
@@ -1,9 +1,12 @@
 Current build problem is:
 
 
-
+gcc -O -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/base/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/unix/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/parsec/include   -fno-defer-pop -fomit-frame-pointer  -DNO_REGS -DUSE_MINIINTERPRETER  -DDONT_WANT_WIN32_DLL_SUPPORT -D__GLASGOW_HASKELL__=604  -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/readline/include -Wall  -W -Wstrict-prototypes  -Wmissing-prototypes  -Wmissing-declarations -Winline -Waggregate-return -Wbad-function-cast -I../includes -I. -Iparallel -DCOMPILING_RTS -fomit-frame-pointer    -c Sparks.c -o Sparks.o
+gcc -O -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/base/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/unix/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/parsec/include   -fno-defer-pop -fomit-frame-pointer  -DNO_REGS -DUSE_MINIINTERPRETER  -DDONT_WANT_WIN32_DLL_SUPPORT -D__GLASGOW_HASKELL__=604  -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/readline/include -Wall  -W -Wstrict-prototypes  -Wmissing-prototypes  -Wmissing-declarations -Winline -Waggregate-return -Wbad-function-cast -I../includes -I. -Iparallel -DCOMPILING_RTS -fomit-frame-pointer    -c Stable.c -o Stable.o
+In file included from /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes/Rts.h:19:0,
+                 from Stable.c:13:
 Stable.c:75:17: error: conflicting types for 'stable_ptr_table'
- StgWord RTS_VAR(stable_ptr_table) = NULL;
+ snEntry RTS_VAR(stable_ptr_table) = NULL;
                  ^
 /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes/Stg.h:60:20: note: in definition of macro 'RTS_VAR'
  #define RTS_VAR(x) x
@@ -12,4 +15,17 @@ In file included from /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes/Rt
                  from Stable.c:13:
 /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes/Stable.h:39:32: note: previous declaration of 'stable_ptr_table' was here
         DLL_IMPORT_RTS snEntry *stable_ptr_table;
-
+                                ^~~~~~~~~~~~~~~~
+In file included from /usr/include/stdlib.h:85:0,
+                 from /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes/Rts.h:86,
+                 from Stable.c:13:
+Stable.c:75:37: error: invalid initializer
+ snEntry RTS_VAR(stable_ptr_table) = NULL;
+                                     ^
+Stable.c: In function 'lookupStableName':
+Stable.c:186:26: error: invalid operands to binary - (have 'snEntry * {aka struct <anonymous> *}' and 'snEntry {aka struct <anonymous>}')
+     sn = stable_ptr_free - stable_ptr_table;
+                          ^
+Stable.c:188:21: error: subscripted value is neither array nor pointer nor vector
+     stable_ptr_table[sn].ref = 0;
+                     ^
diff --git a/ghc68/distinfo b/ghc68/distinfo
index 0ed500b8e5..8b2c4e9c8e 100644
--- a/ghc68/distinfo
+++ b/ghc68/distinfo
@@ -39,7 +39,8 @@ SHA1 (patch-at) = f6c1b589d1285e14de9344cdcbbacb4d128e8f7c
 SHA1 (patch-au) = 4eb10fb1558a758ce9919c422ec7f15fa5b466e1
 SHA1 (patch-ghc-6.4.2-wlibraries_base_include_HsBase.h) = e29eecf3d9ba267e719daa8c127c7df2c7328422
 SHA1 (patch-ghc-6.4.2_ghc_includes_DerivedConstants.c) = 9509651d6dbdfb1391f7a51f8c6abe8d36882e0d
+SHA1 (patch-ghc-6.4.2_libraries_base_include_HSBase.h) = 2323c5b63b61cb70f06d2c729c56cfc00e463ead
 SHA1 (patch-ghc.6.4.2_ghc_includes_Makefile) = c09dac2e629e6f4e13204cde5defac0e1e84c6b3
-SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.c) = d2f4a58ba60f761388067d081440a99e1492bdc8
+SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.c) = 8ab5ff8abfb278a0b50bb94711c9a30b788e3d73
 SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.h) = 1f259ab4af320c6b3cae17b2eaf0d6fcd21850c9
 SHA1 (patch-includes_Makefile) = cfd571976b611914fa469a357030b4657e95fdd0
diff --git a/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c b/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
index 759a695862..fe77ea0f40 100644
--- a/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
+++ b/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
@@ -8,7 +8,7 @@ probably not necessary
    application, etc of a stable pointer.
  
  */
-+StgWord RTS_VAR(stable_ptr_table) = NULL;
++snEntry RTS_VAR(stable_ptr_table) = NULL;
  
  snEntry *stable_ptr_table = NULL;
  static snEntry *stable_ptr_free = NULL;