| 1 |
grobian 12/05/01 06:17:02 |
| 2 |
|
| 3 |
Modified: ghc-7.4.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Restore and fix support for darwin and solaris keywords, introduced and marked ~x64-macos support |
| 6 |
|
| 7 |
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-lang/ghc/ghc-7.4.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ghc-7.4.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ghc-7.4.1-r1.ebuild 27 Apr 2012 18:14:42 -0000 1.1 |
| 23 |
+++ ghc-7.4.1-r1.ebuild 1 May 2012 06:17:02 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.1 2012/04/27 18:14:42 slyfox Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1-r1.ebuild,v 1.2 2012/05/01 06:17:02 grobian Exp $ |
| 29 |
|
| 30 |
# Brief explanation of the bootstrap logic: |
| 31 |
# |
| 32 |
@@ -51,6 +51,13 @@ |
| 33 |
# various ports: |
| 34 |
#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )" |
| 35 |
|
| 36 |
+# prefix ports: |
| 37 |
+arch_binaries="$arch_binaries x86-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-i386-apple-darwin.tar.bz2 )" |
| 38 |
+arch_binaries="$arch_binaries x64-macos? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-x86_64-apple-darwin.tar.bz2 )" |
| 39 |
+arch_binaries="$arch_binaries ppc-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-powerpc-apple-darwin.tar.bz2 )" |
| 40 |
+arch_binaries="$arch_binaries x86-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-i386-unknown-solaris2.tar.bz2 )" |
| 41 |
+arch_binaries="$arch_binaries sparc-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-sparc-sun-solaris2.tar.bz2 )" |
| 42 |
+ |
| 43 |
# 0 - yet |
| 44 |
yet_binary() { |
| 45 |
case "${ARCH}" in |
| 46 |
@@ -64,6 +71,11 @@ |
| 47 |
ppc64) return 0 ;; |
| 48 |
sparc) return 0 ;; |
| 49 |
x86) return 0 ;; |
| 50 |
+ x86-macos) return 0 ;; |
| 51 |
+ x64-macos) return 0 ;; |
| 52 |
+ ppc-macos) return 0 ;; |
| 53 |
+ x86-solaris) return 0 ;; |
| 54 |
+ sparc-solaris) return 0 ;; |
| 55 |
*) return 1 ;; |
| 56 |
esac |
| 57 |
} |
| 58 |
@@ -73,7 +85,7 @@ |
| 59 |
LICENSE="BSD" |
| 60 |
SLOT="0" |
| 61 |
# ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow |
| 62 |
-KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 63 |
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
| 64 |
IUSE="doc ghcbootstrap llvm" |
| 65 |
IUSE+=" binary" # don't forget about me later! |
| 66 |
|
| 67 |
@@ -272,7 +284,7 @@ |
| 68 |
src_prepare() { |
| 69 |
ghc_setup_cflags |
| 70 |
|
| 71 |
- if ! use ghcbootstrap; then |
| 72 |
+ if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then |
| 73 |
# Modify the wrapper script from the binary tarball to use GHC_FLAGS. |
| 74 |
# See bug #313635. |
| 75 |
sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_FLAGS}|" \ |
| 76 |
@@ -295,16 +307,16 @@ |
| 77 |
if ! use ghcbootstrap; then |
| 78 |
case ${CHOST} in |
| 79 |
*-darwin* | *-solaris*) |
| 80 |
- # UPDATE ME for ghc-7 |
| 81 |
mkdir "${WORKDIR}"/ghc-bin-installer || die |
| 82 |
pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die |
| 83 |
use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2 |
| 84 |
use x86-solaris && unpack ghc-6.10.4-i386-unknown-solaris2.tar.bz2 |
| 85 |
use ppc-macos && unpack ghc-6.10.1-powerpc-apple-darwin.tar.bz2 |
| 86 |
use x86-macos && unpack ghc-6.10.1-i386-apple-darwin.tar.bz2 |
| 87 |
+ use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2 |
| 88 |
popd > /dev/null |
| 89 |
|
| 90 |
- pushd "${WORKDIR}"/ghc-bin-installer/ghc-6.10.? > /dev/null || die |
| 91 |
+ pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die |
| 92 |
# fix the binaries so they run, on Solaris we need an |
| 93 |
# LD_LIBRARY_PATH which has our prefix libdirs, on |
| 94 |
# Darwin we need to replace the frameworks with our libs |
| 95 |
@@ -314,12 +326,12 @@ |
| 96 |
export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}" |
| 97 |
elif [[ ${CHOST} == *-darwin* ]] ; then |
| 98 |
# http://hackage.haskell.org/trac/ghc/ticket/2942 |
| 99 |
- pushd utils/haddock/dist-install/build > /dev/null |
| 100 |
- ln -s Haddock haddock >& /dev/null # fails on IN-sensitive |
| 101 |
- popd > /dev/null |
| 102 |
+ cd utils/haddock/dist-install/build &> /dev/null && \ |
| 103 |
+ ln -s Haddock haddock >& /dev/null # fails on IN-sensitive |
| 104 |
|
| 105 |
local readline_framework=GNUreadline.framework/GNUreadline |
| 106 |
- local gmp_framework=/opt/local/lib/libgmp.3.dylib |
| 107 |
+ local gmp_framework6101=/opt/local/lib/libgmp.3.dylib |
| 108 |
+ local gmp_framework741=/opt/local/lib/libgmp.10.dylib |
| 109 |
local ncurses_file=/opt/local/lib/libncurses.5.dylib |
| 110 |
for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do |
| 111 |
install_name_tool -change \ |
| 112 |
@@ -327,7 +339,11 @@ |
| 113 |
"${EPREFIX}"/lib/libreadline.dylib \ |
| 114 |
${binary} || die |
| 115 |
install_name_tool -change \ |
| 116 |
- ${gmp_framework} \ |
| 117 |
+ ${gmp_framework6101} \ |
| 118 |
+ "${EPREFIX}"/usr/lib/libgmp.dylib \ |
| 119 |
+ ${binary} || die |
| 120 |
+ install_name_tool -change \ |
| 121 |
+ ${gmp_framework741} \ |
| 122 |
"${EPREFIX}"/usr/lib/libgmp.dylib \ |
| 123 |
${binary} || die |
| 124 |
install_name_tool -change \ |
| 125 |
@@ -359,13 +375,10 @@ |
| 126 |
|
| 127 |
cd "${S}" # otherwise epatch will break |
| 128 |
|
| 129 |
- epatch "${FILESDIR}/ghc-7.0.4-CHOST-prefix.patch" |
| 130 |
- |
| 131 |
+ epatch "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch |
| 132 |
epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch |
| 133 |
- # failed to apply. FIXME |
| 134 |
- #epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch |
| 135 |
- |
| 136 |
epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch |
| 137 |
+ epatch "${FILESDIR}"/${PN}-7.4.1-darwin-CHOST.patch |
| 138 |
epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch |
| 139 |
|
| 140 |
# one mode external depend with unstable ABI be careful to stash it |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.221 dev-lang/ghc/ChangeLog |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.221&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.221&content-type=text/plain |
| 148 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.220&r2=1.221 |
| 149 |
|
| 150 |
Index: ChangeLog |
| 151 |
=================================================================== |
| 152 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v |
| 153 |
retrieving revision 1.220 |
| 154 |
retrieving revision 1.221 |
| 155 |
diff -u -r1.220 -r1.221 |
| 156 |
--- ChangeLog 30 Apr 2012 15:38:41 -0000 1.220 |
| 157 |
+++ ChangeLog 1 May 2012 06:17:02 -0000 1.221 |
| 158 |
@@ -1,6 +1,11 @@ |
| 159 |
# ChangeLog for dev-lang/ghc |
| 160 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 161 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.220 2012/04/30 15:38:41 grobian Exp $ |
| 162 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.221 2012/05/01 06:17:02 grobian Exp $ |
| 163 |
+ |
| 164 |
+ 01 May 2012; Fabian Groffen <grobian@g.o> |
| 165 |
+ +files/ghc-7.4.1-darwin-CHOST.patch, ghc-7.4.1-r1.ebuild: |
| 166 |
+ Restore and fix support for darwin and solaris keywords, introduced and marked |
| 167 |
+ ~x64-macos support |
| 168 |
|
| 169 |
30 Apr 2012; Fabian Groffen <grobian@g.o> ghc-6.12.3-r2.ebuild: |
| 170 |
Avoid errors for platforms we don't use Gentoo's binaries |
Archives