| 1 |
dcoutts 07/11/05 02:18:22 |
| 2 |
|
| 3 |
Modified: ghc-6.4.2.ebuild ghc-6.6.ebuild ChangeLog |
| 4 |
ghc-6.2.2.ebuild ghc-6.6.1.ebuild |
| 5 |
Log: |
| 6 |
Add sparc and ppc binaries. Also fix some var quoting QA warnings. |
| 7 |
(Portage version: 2.1.3.16) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.22 dev-lang/ghc/ghc-6.4.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?rev=1.22&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?rev=1.22&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild?r1=1.21&r2=1.22 |
| 15 |
|
| 16 |
Index: ghc-6.4.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v |
| 19 |
retrieving revision 1.21 |
| 20 |
retrieving revision 1.22 |
| 21 |
diff -u -r1.21 -r1.22 |
| 22 |
--- ghc-6.4.2.ebuild 22 Jul 2007 08:58:59 -0000 1.21 |
| 23 |
+++ ghc-6.4.2.ebuild 5 Nov 2007 02:18:21 -0000 1.22 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.21 2007/07/22 08:58:59 graaff Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.22 2007/11/05 02:18:21 dcoutts Exp $ |
| 29 |
|
| 30 |
# Brief explanation of the bootstrap logic: |
| 31 |
# |
| 32 |
@@ -159,7 +159,7 @@ |
| 33 |
base_src_unpack |
| 34 |
ghc_setup_cflags |
| 35 |
|
| 36 |
- cd ${S} |
| 37 |
+ cd "${S}" |
| 38 |
epatch "${WORKDIR}/${P}-alut.patch" |
| 39 |
epatch "${FILESDIR}/${P}-sparc32plus.patch" |
| 40 |
epatch "${FILESDIR}/${P}-sparcmangler.patch" |
| 41 |
@@ -177,7 +177,7 @@ |
| 42 |
echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile" |
| 43 |
|
| 44 |
# Don't strip binaries on install. See QA warnings in bug #140369. |
| 45 |
- sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' ${S}/mk/config.mk.in |
| 46 |
+ sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' "${S}/mk/config.mk.in" |
| 47 |
} |
| 48 |
|
| 49 |
src_compile() { |
| 50 |
@@ -269,7 +269,7 @@ |
| 51 |
cd "${S}/ghc" |
| 52 |
dodoc README ANNOUNCE LICENSE VERSION |
| 53 |
|
| 54 |
- dosbin ${FILESDIR}/ghc-updater |
| 55 |
+ dosbin "${FILESDIR}/ghc-updater" |
| 56 |
} |
| 57 |
|
| 58 |
pkg_postinst () { |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.13 dev-lang/ghc/ghc-6.6.ebuild |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild?rev=1.13&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild?rev=1.13&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild?r1=1.12&r2=1.13 |
| 67 |
|
| 68 |
Index: ghc-6.6.ebuild |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v |
| 71 |
retrieving revision 1.12 |
| 72 |
retrieving revision 1.13 |
| 73 |
diff -u -r1.12 -r1.13 |
| 74 |
--- ghc-6.6.ebuild 8 Aug 2007 15:57:56 -0000 1.12 |
| 75 |
+++ ghc-6.6.ebuild 5 Nov 2007 02:18:21 -0000 1.13 |
| 76 |
@@ -1,6 +1,6 @@ |
| 77 |
# Copyright 1999-2007 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.12 2007/08/08 15:57:56 kolmodin Exp $ |
| 80 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.13 2007/11/05 02:18:21 dcoutts Exp $ |
| 81 |
|
| 82 |
# Brief explanation of the bootstrap logic: |
| 83 |
# |
| 84 |
@@ -188,7 +188,7 @@ |
| 85 |
# use test && mv "${WORKDIR}/testsuite" "${S}/" |
| 86 |
|
| 87 |
# Don't strip binaries on install. See QA warnings in bug #140369. |
| 88 |
- sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' ${S}/mk/config.mk.in |
| 89 |
+ sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' "${S}/mk/config.mk.in" |
| 90 |
|
| 91 |
# Temporary patches that needs testing before being pushed upstream: |
| 92 |
cd "${S}" |
| 93 |
@@ -281,7 +281,7 @@ |
| 94 |
cd "${S}" |
| 95 |
dodoc README ANNOUNCE LICENSE VERSION |
| 96 |
|
| 97 |
- dosbin ${FILESDIR}/ghc-updater |
| 98 |
+ dosbin "${FILESDIR}/ghc-updater" |
| 99 |
fi |
| 100 |
|
| 101 |
if use doc; then |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.139 dev-lang/ghc/ChangeLog |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.139&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.139&content-type=text/plain |
| 109 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.138&r2=1.139 |
| 110 |
|
| 111 |
Index: ChangeLog |
| 112 |
=================================================================== |
| 113 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v |
| 114 |
retrieving revision 1.138 |
| 115 |
retrieving revision 1.139 |
| 116 |
diff -u -r1.138 -r1.139 |
| 117 |
--- ChangeLog 23 Oct 2007 16:37:50 -0000 1.138 |
| 118 |
+++ ChangeLog 5 Nov 2007 02:18:21 -0000 1.139 |
| 119 |
@@ -1,6 +1,9 @@ |
| 120 |
# ChangeLog for dev-lang/ghc |
| 121 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 122 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.138 2007/10/23 16:37:50 opfer Exp $ |
| 123 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.139 2007/11/05 02:18:21 dcoutts Exp $ |
| 124 |
+ |
| 125 |
+ 05 Nov 2007; Duncan Coutts <dcoutts@g.o> ghc-6.6.1.ebuild: |
| 126 |
+ Add sparc and ppc binaries. Also fix some var quoting QA warnings. |
| 127 |
|
| 128 |
23 Oct 2007; Christian Faulhammer <opfer@g.o> ghc-6.6.1.ebuild: |
| 129 |
stable x86, bug 196616 |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
1.24 dev-lang/ghc/ghc-6.2.2.ebuild |
| 134 |
|
| 135 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?rev=1.24&view=markup |
| 136 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?rev=1.24&content-type=text/plain |
| 137 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild?r1=1.23&r2=1.24 |
| 138 |
|
| 139 |
Index: ghc-6.2.2.ebuild |
| 140 |
=================================================================== |
| 141 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v |
| 142 |
retrieving revision 1.23 |
| 143 |
retrieving revision 1.24 |
| 144 |
diff -u -r1.23 -r1.24 |
| 145 |
--- ghc-6.2.2.ebuild 13 Jul 2007 06:25:50 -0000 1.23 |
| 146 |
+++ ghc-6.2.2.ebuild 5 Nov 2007 02:18:21 -0000 1.24 |
| 147 |
@@ -1,6 +1,6 @@ |
| 148 |
# Copyright 1999-2007 Gentoo Foundation |
| 149 |
# Distributed under the terms of the GNU General Public License v2 |
| 150 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.23 2007/07/13 06:25:50 mr_bones_ Exp $ |
| 151 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.24 2007/11/05 02:18:21 dcoutts Exp $ |
| 152 |
|
| 153 |
# Brief explanation of the bootstrap logic: |
| 154 |
# |
| 155 |
@@ -141,7 +141,7 @@ |
| 156 |
echo 'GC_HC_OPTS += -optc-fno-strict-aliasing' >> "${S}/ghc/rts/Makefile" |
| 157 |
|
| 158 |
# Don't strip binaries on install. See QA warnings in bug #140369. |
| 159 |
- sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' ${S}/mk/config.mk.in |
| 160 |
+ sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' "${S}/mk/config.mk.in" |
| 161 |
} |
| 162 |
|
| 163 |
src_compile() { |
| 164 |
@@ -214,7 +214,7 @@ |
| 165 |
cd "${S}/ghc" |
| 166 |
dodoc README ANNOUNCE LICENSE VERSION |
| 167 |
|
| 168 |
- dosbin ${FILESDIR}/ghc-updater |
| 169 |
+ dosbin "${FILESDIR}/ghc-updater" |
| 170 |
} |
| 171 |
|
| 172 |
pkg_postinst () { |
| 173 |
|
| 174 |
|
| 175 |
|
| 176 |
1.11 dev-lang/ghc/ghc-6.6.1.ebuild |
| 177 |
|
| 178 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild?rev=1.11&view=markup |
| 179 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild?rev=1.11&content-type=text/plain |
| 180 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild?r1=1.10&r2=1.11 |
| 181 |
|
| 182 |
Index: ghc-6.6.1.ebuild |
| 183 |
=================================================================== |
| 184 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v |
| 185 |
retrieving revision 1.10 |
| 186 |
retrieving revision 1.11 |
| 187 |
diff -u -r1.10 -r1.11 |
| 188 |
--- ghc-6.6.1.ebuild 23 Oct 2007 16:37:50 -0000 1.10 |
| 189 |
+++ ghc-6.6.1.ebuild 5 Nov 2007 02:18:21 -0000 1.11 |
| 190 |
@@ -1,6 +1,6 @@ |
| 191 |
# Copyright 1999-2007 Gentoo Foundation |
| 192 |
# Distributed under the terms of the GNU General Public License v2 |
| 193 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.10 2007/10/23 16:37:50 opfer Exp $ |
| 194 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.11 2007/11/05 02:18:21 dcoutts Exp $ |
| 195 |
|
| 196 |
# Brief explanation of the bootstrap logic: |
| 197 |
# |
| 198 |
@@ -44,12 +44,13 @@ |
| 199 |
amd64? ( mirror://gentoo/ghc-bin-${PV}-amd64.tbz2 ) |
| 200 |
hppa? ( mirror://gentoo/ghc-bin-${PV}-hppa.tbz2 ) |
| 201 |
ia64? ( mirror://gentoo/ghc-bin-${PV}-ia64.tbz2 ) |
| 202 |
+ ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 ) |
| 203 |
+ sparc? ( mirror://gentoo/ghc-bin-${PV}-sparc.tbz2 ) |
| 204 |
x86? ( mirror://gentoo/ghc-bin-${PV}-x86.tbz2 )" |
| 205 |
|
| 206 |
LICENSE="BSD" |
| 207 |
SLOT="0" |
| 208 |
-KEYWORDS="~amd64 ~hppa ~ia64 x86" |
| 209 |
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 210 |
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc x86" |
| 211 |
IUSE="binary doc ghcbootstrap" |
| 212 |
|
| 213 |
LOC="/opt/ghc" # location for installation of binary version |
| 214 |
@@ -142,6 +143,12 @@ |
| 215 |
die "USE=\"ghcbootstrap binary\" is not a valid combination." |
| 216 |
[[ -z $(type -P ghc) ]] && \ |
| 217 |
die "Could not find a ghc to bootstrap with." |
| 218 |
+ elif use alpha || use ppc64; then |
| 219 |
+ eerror "No binary .tbz2 package available yet for these arches:" |
| 220 |
+ eerror " alpha, ppc64" |
| 221 |
+ eerror "Please try emerging with USE=ghcbootstrap and report build" |
| 222 |
+ eerror "sucess or failure to the haskell team (haskell@g.o)" |
| 223 |
+ die "No binary available for this arch yet, USE=ghcbootstrap" |
| 224 |
fi |
| 225 |
|
| 226 |
set_config |
| 227 |
@@ -199,7 +206,7 @@ |
| 228 |
# use test && mv "${WORKDIR}/testsuite" "${S}/" |
| 229 |
|
| 230 |
# Don't strip binaries on install. See QA warnings in bug #140369. |
| 231 |
- sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' ${S}/mk/config.mk.in |
| 232 |
+ sed -i -e 's/SRC_INSTALL_BIN_OPTS += -s//' "${S}/mk/config.mk.in" |
| 233 |
|
| 234 |
# Temporary patches that needs testing before being pushed upstream: |
| 235 |
cd "${S}" |
| 236 |
@@ -244,7 +251,7 @@ |
| 237 |
|
| 238 |
# GHC build system knows to build unregisterised on alpha and hppa, |
| 239 |
# but we have to tell it to build unregisterised on some arches |
| 240 |
- if use alpha || use hppa || use ppc64; then |
| 241 |
+ if use alpha || use hppa || use ppc64 || use sparc; then |
| 242 |
echo "GhcUnregisterised=YES" >> mk/build.mk |
| 243 |
echo "GhcWithInterpreter=NO" >> mk/build.mk |
| 244 |
fi |
| 245 |
@@ -318,7 +325,7 @@ |
| 246 |
cd "${S}" |
| 247 |
dodoc README ANNOUNCE LICENSE VERSION |
| 248 |
|
| 249 |
- dosbin ${FILESDIR}/ghc-updater |
| 250 |
+ dosbin "${FILESDIR}/ghc-updater" |
| 251 |
|
| 252 |
dobashcompletion "${FILESDIR}/ghc-bash-completion" |
| 253 |
|
| 254 |
|
| 255 |
|
| 256 |
|
| 257 |
-- |
| 258 |
gentoo-commits@g.o mailing list |
Archives