diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:38:41 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:38:41 +0000 |
| commit | 069012c436d263c7992214b480a1447633bd29b0 (patch) | |
| tree | ade56772d885c80cba8147a92621b354e6d7668f /dev-lang/ghc | |
| parent | add upstream patch for mips (diff) | |
| download | historical-069012c436d263c7992214b480a1447633bd29b0.tar.gz historical-069012c436d263c7992214b480a1447633bd29b0.tar.bz2 historical-069012c436d263c7992214b480a1447633bd29b0.zip | |
Avoid errors for platforms we don't use Gentoo's binaries
Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386
Diffstat (limited to 'dev-lang/ghc')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-6.12.3-r2.ebuild | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index fe2ca5e416e7..010a9bd3a83e 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.219 2012/04/27 18:14:42 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.220 2012/04/30 15:38:41 grobian Exp $ + + 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> ghc-6.12.3-r2.ebuild: + Avoid errors for platforms we don't use Gentoo's binaries *ghc-7.4.1-r1 (27 Apr 2012) diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 703cbc92b9ed..9663e0f749ea 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -73,17 +73,17 @@ DIST ghc-bin-7.4.1-ppc64.tbz2 101724506 RMD160 90cbe2fc40b3373e9a113eadd3e0b2e5b DIST ghc-bin-7.4.1-sparc.tbz2 117317699 RMD160 380f218db33edf7728a091aaf5539c6135131291 SHA1 68d864c62969c1c0ffdff845d05168c2526cbc4e SHA256 c318674f5ffe5fae91becaf5747a1fb27f90fea50893766468bb729ce45ccf3f DIST ghc-bin-7.4.1-x86.tbz2 91033605 RMD160 35b3d9a82a39a28c91129e72cea13f06059b846b SHA1 f5bca10026320f7bfb40d3d49fef743050c60f64 SHA256 e5ff322b0496519b8bb879c9c87a25cd2d89921c89850b8fd21247cfd281e942 EBUILD ghc-6.10.4-r1.ebuild 13015 RMD160 540f5f7ea1ee0b37c4ffaf7db5dfad398fce0711 SHA1 51ddf8879fbda68c67e9c6c1ded0190f2abb3d16 SHA256 63be2b4343c65f3b12699355b0bf28fccc1518eedd77ccaa902fe3207ee1d16c -EBUILD ghc-6.12.3-r2.ebuild 20512 RMD160 06c922cea1ec6b9de74beced959c20e87efe506d SHA1 a769c5abab43f125d13b8ad4ccd261fab0ed8eeb SHA256 b25cb0d0793647836fd36ca7753a23874607e62e005ac78b0d17f660495901aa +EBUILD ghc-6.12.3-r2.ebuild 20570 RMD160 ddaee5c9812d1a68994c47d2fb2b7f7c97cb5142 SHA1 dbdb74959cb125d873638661ffcaeae0b151d6da SHA256 d1bac3b88691bc27eefde9a04580a97e76e41d11b30c32b7f0dc92de4a367613 EBUILD ghc-6.12.3.ebuild 15067 RMD160 d2085cb62d3d1f02ae1aeece6f5d7eedc043d8bb SHA1 1d42ba8dd60f239af8ecfda0d7c24b73050d2ac9 SHA256 85d10ae535a35d5b2a78852f380fe1dd66a06572f605ffbd472c47ff402ec102 EBUILD ghc-7.0.4.ebuild 20079 RMD160 46666d45829791995f06034ccc3479c55ab7ed99 SHA1 920d5debdbee58aeb36b614e855d6dcfaf2eb974 SHA256 0f9e20b908d61685e5725fbefc9ae4d65c4a3ae53179054492902dd8638d5d5f EBUILD ghc-7.4.1-r1.ebuild 20874 RMD160 ba6fc3de619c0eeb2b3af7b68a1cf247d0ecd677 SHA1 2629152e9920fc3beaa239f967a9476dee4319df SHA256 bf9c6d852d3719c499a14f802124e74a8eefca5f73aa47ff84385fa9e8fde81c EBUILD ghc-7.4.1.ebuild 20450 RMD160 e85827638c46e85e35b9537a89525e62f60b2890 SHA1 42205ce6d5971ded7057ee43e9dad1df8077734f SHA256 8a0a3b104ddbb23c2de1128b60f194108739330d35bafc4c8349f62113a759c9 -MISC ChangeLog 40512 RMD160 5364c54d855388977d69a5edd7b0baee63db5b55 SHA1 8e63f89c29a1f346cfa4280f390cad9fba764142 SHA256 4c4beb622a7c0241d2a705688e87747d03e9ae30b6ab47348c7d31870bad3000 +MISC ChangeLog 40647 RMD160 6bb9a164b98ca70b9fdcd052c857abaab40c15c1 SHA1 056cad12c60f9708200719e8f32ad26ad8e68ca1 SHA256 60b9c60190bceb15aa1bddc84a7a52298ffd463a6480ec6de760b9d20bf18173 MISC metadata.xml 511 RMD160 79a995fb7989ead0e2a1aaae42a015a34864e2ff SHA1 a7222153de1350459b28c0be825beeb13c0aa16e SHA256 4474d6b9638e6b78e16025c88b5455fa353ca723c05ce80aa3f8b426149ec1dd -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (Darwin) -iEYEARECAAYFAk+a40UACgkQcaHudmEf86qIbgCggNeUbaBTG6KnLYnzkIUCQNiC -TgcAn3EykIMru3MyFVtpT8xLnjZQQL0j -=1Yq3 +iEYEARECAAYFAk+esjIACgkQX3X2B8XHTol9eQCfWbGX9frCSIRRmHJ5eZXsv+0J +efwAmgJYB23RJYzq4yUpcWfYkSjFw6K8 +=TrAh -----END PGP SIGNATURE----- diff --git a/dev-lang/ghc/ghc-6.12.3-r2.ebuild b/dev-lang/ghc/ghc-6.12.3-r2.ebuild index 5d28f3f8ff12..ae9ddd88df3f 100644 --- a/dev-lang/ghc/ghc-6.12.3-r2.ebuild +++ b/dev-lang/ghc/ghc-6.12.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.7 2012/04/13 19:01:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3-r2.ebuild,v 1.8 2012/04/30 15:38:41 grobian Exp $ # Brief explanation of the bootstrap logic: # @@ -225,7 +225,7 @@ src_prepare() { ghc_setup_cflags - if ! use ghcbootstrap; then + if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then # Modify the wrapper script from the binary tarball to use GHC_CFLAGS. # See bug #313635. sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_CFLAGS}|" \ |