bugfix in ghc-5.04.3-r1.ebuild

4 files changed, 113 insertions, 8 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 369e7e4ffe7d..fbe71712d570 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.13 2003/05/09 08:39:11 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.14 2003/05/22 06:52:30 kosmikus Exp $
+
+  21 May 2003; Andres Loeh <kosmikus@gentoo.org> ghc-5.04.3-r1.ebuild,
+  files/ghc-5.04.3-r1.patch:
+  Added a dependency to haddock when generating docs. This should fix bug
+  #20989. Thanks to Mikael A <snikkt@yahoo.com> and Peter Lennartz
+  <peterl@cs.uu.nl> for identifying the problem.
 
 *ghc-5.04.3-r1 (09 May 2003)
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 4cc65ad53a78..57523d400ab7 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,9 +1,9 @@
-MD5 c75534de5f96044dbe3fe8011853b472 ChangeLog 4002
+MD5 3431997b0f5acc4335ee48ce60e4077f ChangeLog 4002
 MD5 42b857369c2e24507f00520e99fdaf5a ghc-5.02.3.ebuild 7646
 MD5 4e310a2cb7f0093cd85d9a366f2337cc ghc-5.04.2.ebuild 4536
 MD5 53cadcab720c08f0d03fced644adc7ce ghc-5.04.3.ebuild 4536
 MD5 d1ee334700eb465393538865978531b5 ghc-5.04.ebuild 6950
-MD5 1fbd2d6de29f858af95ea050308d4192 ghc-5.04.3-r1.ebuild 6062
+MD5 5017802bf913628f63a0e8e142d967ef ghc-5.04.3-r1.ebuild 6062
 MD5 2891bd736d41f4aeea530385ef426d6d files/digest-ghc-5.02.3 207
 MD5 199f2676b7f849997c3e45c0c604c4a5 files/digest-ghc-5.04 205
 MD5 7bf7dff845836a99f4b08d8b230d916f files/digest-ghc-5.04.2 68
diff --git a/dev-lang/ghc/files/ghc-5.04.3-r1.patch b/dev-lang/ghc/files/ghc-5.04.3-r1.patch
new file mode 100644
index 000000000000..c0f47a255ae0
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-5.04.3-r1.patch
@@ -0,0 +1,85 @@
+diff -Naur ghc-5.04.3.old/ghc/rts/Linker.c ghc-5.04.3/ghc/rts/Linker.c
+--- ghc-5.04.3.old/ghc/rts/Linker.c	2003-05-06 02:01:16.000000000 +0200
++++ ghc-5.04.3/ghc/rts/Linker.c	2003-05-06 02:19:52.000000000 +0200
+@@ -196,11 +196,7 @@
+       SymX(uname)                               \
+       SymX(unlink)                              \
+       SymX(utime)                               \
+-      SymX(waitpid)                             \
+-      Sym(__divdi3)                             \
+-      Sym(__udivdi3)                            \
+-      Sym(__moddi3)                             \
+-      Sym(__umoddi3)
++      SymX(waitpid)
+ 
+ #elif !defined(mingw32_TARGET_OS)
+ #define RTS_MINGW_ONLY_SYMBOLS /**/
+@@ -271,11 +267,7 @@
+       Sym(opendir)                              \
+       Sym(readdir)                              \
+       Sym(rewinddir)                            \
+-      Sym(closedir)                             \
+-      Sym(__divdi3)                             \
+-      Sym(__udivdi3)                            \
+-      Sym(__moddi3)                             \
+-      Sym(__umoddi3)
++      Sym(closedir)
+ #endif
+ 
+ #ifndef SMP
+@@ -498,12 +490,9 @@
+ #define RTS_LONG_LONG_SYMS /* nothing */
+ #endif
+ 
+-#ifdef ia64_TARGET_ARCH
+-/* force these symbols to be present */
+-#define RTS_EXTRA_SYMBOLS			\
+-      Sym(__divsf3)
+-#elif defined(powerpc_TARGET_ARCH)
+-#define RTS_EXTRA_SYMBOLS                	\
++// 64-bit support functions in libgcc.a
++#if defined(__GNUC__) && SIZEOF_VOID_P <= 4
++#define RTS_LIBGCC_SYMBOLS                      \
+       Sym(__divdi3)                             \
+       Sym(__udivdi3)                            \
+       Sym(__moddi3)                             \
+@@ -511,7 +500,22 @@
+       Sym(__ashldi3)				\
+       Sym(__ashrdi3)				\
+       Sym(__lshrdi3)				\
+-      SymX(__eprintf)
++      Sym(__eprintf)
++#else
++#define RTS_LIBGCC_SYMBOLS
++#endif
++
++#ifdef ia64_TARGET_ARCH
++/* force these symbols to be present */
++#define RTS_EXTRA_SYMBOLS			\
++      Sym(__divsf3)
++#elif defined(powerpc_TARGET_ARCH)
++      // Symbols that don't have a leading underscore
++      // on Mac OS X. They have to receive special treatment,
++      // see machoInitSymbolsWithoutUnderscore()
++#define RTS_MACHO_NOUNDERLINE_SYMBOLS           \
++      Sym(saveFP)                               \
++      Sym(restFP)
+ #else
+ #define RTS_EXTRA_SYMBOLS /* nothing */
+ #endif
+@@ -525,6 +529,7 @@
+ RTS_POSIX_ONLY_SYMBOLS
+ RTS_MINGW_ONLY_SYMBOLS
+ RTS_CYGWIN_ONLY_SYMBOLS
++RTS_LIBGCC_SYMBOLS
+ #undef Sym
+ #undef SymX
+ 
+@@ -545,6 +550,7 @@
+       RTS_POSIX_ONLY_SYMBOLS
+       RTS_MINGW_ONLY_SYMBOLS
+       RTS_CYGWIN_ONLY_SYMBOLS
++      RTS_LIBGCC_SYMBOLS
+       { 0, 0 } /* sentinel */
+ };
+ 
diff --git a/dev-lang/ghc/ghc-5.04.3-r1.ebuild b/dev-lang/ghc/ghc-5.04.3-r1.ebuild
index e9260f245152..ddde9a8bfac9 100644
--- a/dev-lang/ghc/ghc-5.04.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-5.04.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.3-r1.ebuild,v 1.1 2003/05/09 08:39:11 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.3-r1.ebuild,v 1.2 2003/05/22 06:52:30 kosmikus Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -51,6 +51,7 @@ DEPEND="virtual/ghc
 		>=app-text/sgml-common-0.6.3
 		=app-text/docbook-sgml-dtd-3.1-r1
 		>=app-text/docbook-dsssl-stylesheets-1.64
+		>=dev-haskell/haddock-0.4
 		tetex? ( >=app-text/tetex-1.0.7
 			>=app-text/jadetex-3.12 ) )	
 	opengl? ( virtual/opengl
@@ -168,12 +169,21 @@ src_compile() {
 src_install () {
 	local mydoc
 
-	use doc && mydoc="html" || mydoc=""
-	use doc && use tetex && mydoc="${mydoc} ps"
-
 	pushd "${STAGE2_B}" || die
+		# determine what to do with documentation
+		if [ `use doc` ]; then
+			mydoc="html"
+			if [ `use tetex` ]; then
+				mydoc="${mydoc} ps"
+			fi
+		else
+			mydoc=""
+			# needed to prevent haddock from being called
+			echo NO_HADDOCK_DOCS=YES >> mk/build.mk
+		fi
+		echo SGMLDocWays="${mydoc}" >> mk/build.mk
+
 		make install install-docs \
-			SGMLDocWays="${mydoc}" \
 			prefix="${D}/usr" \
 			datadir="${D}/usr/share/doc/${PF}" \
 			infodir="${D}/usr/share/info" \
@@ -191,3 +201,7 @@ src_install () {
 	dodoc README ANNOUNCE LICENSE VERSION
 }
 
+pkg_postinst () {
+	einfo "If you have dev-lang/ghc-bin installed, you might"
+	einfo "want to unmerge it again. It is no longer needed."
+}