diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2006-05-02 15:33:45 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2006-05-02 15:33:45 +0000 |
| commit | e21929806117aa105732d1f29539ab6b736b6adb (patch) | |
| tree | 3603e586dd55d0696c084610251288b85d29ff7e /dev-lang | |
| parent | Ensure that libxkbfile provides the symbols needed in older versions of (diff) | |
| download | gentoo-2-e21929806117aa105732d1f29539ab6b736b6adb.tar.gz gentoo-2-e21929806117aa105732d1f29539ab6b736b6adb.tar.bz2 gentoo-2-e21929806117aa105732d1f29539ab6b736b6adb.zip | |
Patch to fix make 3.81 hanging (backport of the fix in ghc-6.4.2)
(Portage version: 2.1_pre9-r5)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-6.4.1-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-6.4.1-r3.ebuild | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 05a414c42700..a40afb59f8a1 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.97 2006/04/27 21:49:08 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.98 2006/05/02 15:33:45 dcoutts Exp $ + + 02 May 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r2.ebuild, + ghc-6.4.1-r3.ebuild: + Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2) 27 Apr 2006; Duncan Coutts <dcoutts@gentoo.org> -files/ghc-6.4-powerpc.patch, +ghc-6.4.2.ebuild: diff --git a/dev-lang/ghc/ghc-6.4.1-r2.ebuild b/dev-lang/ghc/ghc-6.4.1-r2.ebuild index 1823c28a8e90..949f8c0713df 100644 --- a/dev-lang/ghc/ghc-6.4.1-r2.ebuild +++ b/dev-lang/ghc/ghc-6.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.12 2006/03/28 17:28:48 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r2.ebuild,v 1.13 2006/05/02 15:33:45 dcoutts Exp $ # Brief explanation of the bootstrap logic: # @@ -91,6 +91,9 @@ src_unpack() { echo "SCRIPT_SUBST_VARS += GHC_CFLAGS" >> "${S}/ghc/driver/ghc/Makefile" echo "GHC_CFLAGS = ${GHC_CFLAGS}" >> "${S}/ghc/driver/ghc/Makefile" sed -i -e 's|$TOPDIROPT|$TOPDIROPT $GHC_CFLAGS|' "${S}/ghc/driver/ghc/ghc.sh" + + # Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2) + sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk" } src_compile() { diff --git a/dev-lang/ghc/ghc-6.4.1-r3.ebuild b/dev-lang/ghc/ghc-6.4.1-r3.ebuild index 056a778d9365..0e57021fe00f 100644 --- a/dev-lang/ghc/ghc-6.4.1-r3.ebuild +++ b/dev-lang/ghc/ghc-6.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.4 2006/04/27 21:41:38 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.5 2006/05/02 15:33:45 dcoutts Exp $ # Brief explanation of the bootstrap logic: # @@ -139,6 +139,9 @@ src_unpack() { # Patch to fix parallel make sed -i 's/mkDerivedConstants.c : $(H_CONFIG)/mkDerivedConstants.c : $(H_CONFIG) $(H_PLATFORM)/' "${S}/ghc/includes/Makefile" + + # Patch to fix make-3.81 hanging (backport of the fix in ghc-6.4.2) + sed -i -e 's/.SECONDARY://' "${S}/mk/suffix.mk" } src_compile() { |