Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/ghc/files: ghc-7.4-rc2-macos-prefix-respect-gcc.patch ghc-7.2.1-freebsd-CHOST.patch
Date: Sun, 04 Mar 2012 05:50:11
Message-Id: 20120304054954.EAA5A2004C@flycatcher.gentoo.org
1 gienah 12/03/04 05:49:54
2
3 Added: ghc-7.4-rc2-macos-prefix-respect-gcc.patch
4 ghc-7.2.1-freebsd-CHOST.patch
5 Log:
6 Bump ghc to 7.4.1
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch?rev=1.1&content-type=text/plain
15
16 Index: ghc-7.4-rc2-macos-prefix-respect-gcc.patch
17 ===================================================================
18 diff --git a/aclocal.m4 b/aclocal.m4
19 index a377cb9..4f8fd69 100644
20 --- a/aclocal.m4
21 +++ b/aclocal.m4
22 @@ -1950,17 +1950,7 @@ AC_DEFUN([XCODE_VERSION],[
23 # --------------------------------
24 # Finds where gcc is
25 AC_DEFUN([FIND_GCC],[
26 - if test "$TargetOS_CPP" = "darwin" &&
27 - test "$XCodeVersion1" -eq 4 &&
28 - test "$XCodeVersion2" -lt 2
29 - then
30 - # In Xcode 4.1, 'gcc-4.2' is the gcc legacy backend (rather
31 - # than the LLVM backend). We prefer the legacy gcc, but in
32 - # Xcode 4.2 'gcc-4.2' was removed.
33 - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2])
34 - else
35 - FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
36 - fi
37 + FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
38 export CC
39 WhatGccIsCalled="$CC"
40 AC_SUBST(WhatGccIsCalled)
41
42
43
44 1.1 dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch?rev=1.1&content-type=text/plain
48
49 Index: ghc-7.2.1-freebsd-CHOST.patch
50 ===================================================================
51 diff --git a/aclocal.m4 b/aclocal.m4
52 index 11bb003..52df243 100644
53 --- a/aclocal.m4
54 +++ b/aclocal.m4
55 @@ -1545,7 +1545,7 @@ case "$1" in
56 freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
57 $2="$1"
58 ;;
59 - freebsd8) # like i686-gentoo-freebsd8
60 + freebsd*) # like i686-gentoo-freebsd8 or i686-gentoo-freebsd8.2
61 $2="freebsd"
62 ;;
63 darwin*)