From: "Lennart Kolmodin (kolmodin)" <kolmodin@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild
Date: Sat, 12 Jun 2010 20:34:32 +0000 (UTC) [thread overview]
Message-ID: <20100612203432.6FA7D2CE14@corvid.gentoo.org> (raw)
kolmodin 10/06/12 20:34:32
Modified: ChangeLog ghc-6.10.4-r1.ebuild
Log:
dev-lang/ghc: fixing bug #313635 for ghc 6.10.4-r1
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.176 dev-lang/ghc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 31 May 2010 18:18:44 -0000 1.175
+++ ChangeLog 12 Jun 2010 20:34:32 -0000 1.176
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/ghc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.175 2010/05/31 18:18:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.176 2010/06/12 20:34:32 kolmodin Exp $
+
+ 12 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org> ghc-6.10.4-r1.ebuild:
+ Edit the ghc-wrapper installed by USE=binary to include GHC_CFLAGS from
+ the user's compilation.
+ This solves problems for hardend users, as the ghc binaries are not build
+ on hardend systems. See bug #313635 for details.
+ Patch by xake@rymdraket.net.
31 May 2010; Joseph Jezak <josejx@gentoo.org> ghc-6.10.4-r1.ebuild,
ghc-6.12.1.ebuild:
1.4 dev-lang/ghc/ghc-6.10.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild?r1=1.3&r2=1.4
Index: ghc-6.10.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghc-6.10.4-r1.ebuild 31 May 2010 18:18:44 -0000 1.3
+++ ghc-6.10.4-r1.ebuild 12 Jun 2010 20:34:32 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.3 2010/05/31 18:18:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.10.4-r1.ebuild,v 1.4 2010/06/12 20:34:32 kolmodin Exp $
# Brief explanation of the bootstrap logic:
#
@@ -102,7 +102,6 @@
# We also use these CFLAGS for building the C parts of ghc, ie the rts.
strip-flags
strip-unsupported-flags
- filter-flags -fPIC
GHC_CFLAGS=""
for flag in ${CFLAGS}; do
@@ -156,6 +155,13 @@
base_src_unpack
ghc_setup_cflags
+ if ! use ghcbootstrap; then
+ # Modify the wrapper script from the binary tarball to use GHC_CFLAGS.
+ # See bug #313635.
+ sed -i -e "s|wrapped|wrapped ${GHC_CFLAGS}|" \
+ "${WORKDIR}/usr/bin/ghc-${PV}"
+ fi
+
if use binary; then
# Move unpacked files to the expected place
next reply other threads:[~2010-06-12 20:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-12 20:34 Lennart Kolmodin (kolmodin) [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-11-06 20:28 [gentoo-commits] gentoo-x86 commit in dev-lang/ghc: ChangeLog ghc-6.10.4-r1.ebuild Sergei Trofimovich (slyfox)
2010-07-16 20:23 Sergei Trofimovich (slyfox)
2009-12-05 9:19 Lennart Kolmodin (kolmodin)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100612203432.6FA7D2CE14@corvid.gentoo.org \
--to=kolmodin@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox