| 1 |
slyfox 14/07/05 15:40:40 |
| 2 |
|
| 3 |
Modified: ghc-7.6.3-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
pax-mark ghc-stage2 before it's used first time. Fixes bootstrap failure on hardened (bug #516430 by Markus Oehme). |
| 6 |
|
| 7 |
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 dev-lang/ghc/ghc-7.6.3-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: ghc-7.6.3-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- ghc-7.6.3-r1.ebuild 27 Jun 2014 09:54:02 -0000 1.11 |
| 23 |
+++ ghc-7.6.3-r1.ebuild 5 Jul 2014 15:40:40 -0000 1.12 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 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.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.12 2014/07/05 15:40:40 slyfox Exp $ |
| 29 |
|
| 30 |
# Brief explanation of the bootstrap logic: |
| 31 |
# |
| 32 |
@@ -603,8 +603,13 @@ |
| 33 |
# ghc massively parallel make: #409631, #409873 |
| 34 |
# but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED' |
| 35 |
# 4 parallel jobs usually does not break |
| 36 |
- emake $(limit_jobs 4) all |
| 37 |
- emake all V=1 |
| 38 |
+ |
| 39 |
+ # 1. build compiler binary(+wrapper) first |
| 40 |
+ emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1 |
| 41 |
+ # 2. pax-mark (bug #516430) |
| 42 |
+ pax-mark -m inplace/lib/ghc-stage2 |
| 43 |
+ # 3. and then all the rest |
| 44 |
+ emake $(limit_jobs 4) all V=1 |
| 45 |
|
| 46 |
if is_crosscompile; then |
| 47 |
# runghc does not work for a stage1 compiler, we can build it anyway |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.257 dev-lang/ghc/ChangeLog |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.257&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.257&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.256&r2=1.257 |
| 56 |
|
| 57 |
Index: ChangeLog |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v |
| 60 |
retrieving revision 1.256 |
| 61 |
retrieving revision 1.257 |
| 62 |
diff -u -r1.256 -r1.257 |
| 63 |
--- ChangeLog 27 Jun 2014 09:54:02 -0000 1.256 |
| 64 |
+++ ChangeLog 5 Jul 2014 15:40:40 -0000 1.257 |
| 65 |
@@ -1,6 +1,10 @@ |
| 66 |
# ChangeLog for dev-lang/ghc |
| 67 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.256 2014/06/27 09:54:02 slyfox Exp $ |
| 69 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.257 2014/07/05 15:40:40 slyfox Exp $ |
| 70 |
+ |
| 71 |
+ 05 Jul 2014; Sergei Trofimovich <slyfox@g.o> ghc-7.6.3-r1.ebuild: |
| 72 |
+ pax-mark ghc-stage2 before it's used first time. Fixes bootstrap failure on |
| 73 |
+ hardened (bug #516430 by Markus Oehme). |
| 74 |
|
| 75 |
27 Jun 2014; Sergei Trofimovich <slyfox@g.o> ghc-7.6.3-r1.ebuild: |
| 76 |
Ignore flags '--with-compiler/--with-gcc' passed by cabal with |
Archives