1 |
slyfox 14/08/01 09:12:49 |
2 |
|
3 |
Modified: ghc-7.6.3-r1.ebuild ghc-7.8.3.ebuild ChangeLog |
4 |
Log: |
5 |
fix installation on PaX kernels (thanks to yangjay) |
6 |
|
7 |
(Portage version: 2.2.10_p40/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA) |
8 |
|
9 |
Revision Changes Path |
10 |
1.13 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.13&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild?rev=1.13&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.12&r2=1.13 |
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.12 |
20 |
retrieving revision 1.13 |
21 |
diff -u -r1.12 -r1.13 |
22 |
--- ghc-7.6.3-r1.ebuild 5 Jul 2014 15:40:40 -0000 1.12 |
23 |
+++ ghc-7.6.3-r1.ebuild 1 Aug 2014 09:12:49 -0000 1.13 |
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.12 2014/07/05 15:40:40 slyfox Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.13 2014/08/01 09:12:49 slyfox Exp $ |
29 |
|
30 |
# Brief explanation of the bootstrap logic: |
31 |
# |
32 |
@@ -604,10 +604,10 @@ |
33 |
# but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED' |
34 |
# 4 parallel jobs usually does not break |
35 |
|
36 |
- # 1. build compiler binary(+wrapper) first |
37 |
- emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1 |
38 |
+ # 1. build compiler binary first |
39 |
+ emake $(limit_jobs 4) ghc/stage2/build/tmp/ghc-stage2 V=1 |
40 |
# 2. pax-mark (bug #516430) |
41 |
- pax-mark -m inplace/lib/ghc-stage2 |
42 |
+ pax-mark -m ghc/stage2/build/tmp/ghc-stage2 |
43 |
# 3. and then all the rest |
44 |
emake $(limit_jobs 4) all V=1 |
45 |
|
46 |
@@ -726,16 +726,11 @@ |
47 |
DESTDIR="${D}" \ |
48 |
|| die "make ${insttarget} failed" |
49 |
|
50 |
- # remove wrapper and linker |
51 |
+ # remove wrapper and link |
52 |
rm -f "${ED}"/usr/bin/haddock* |
53 |
|
54 |
add-c_nonshared-to-ghci-libs |
55 |
|
56 |
- # ghci uses mmap with rwx protection at it implements dynamic |
57 |
- # linking on it's own (bug #299709) |
58 |
- # so mark resulting binary |
59 |
- pax-mark -m "${ED}/usr/$(get_libdir)/${P}/ghc" |
60 |
- |
61 |
if [[ ! -f "${S}/VERSION" ]]; then |
62 |
echo "${GHC_PV}" > "${S}/VERSION" \ |
63 |
|| die "Could not create file ${S}/VERSION" |
64 |
|
65 |
|
66 |
|
67 |
1.5 dev-lang/ghc/ghc-7.8.3.ebuild |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.5&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?rev=1.5&content-type=text/plain |
71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild?r1=1.4&r2=1.5 |
72 |
|
73 |
Index: ghc-7.8.3.ebuild |
74 |
=================================================================== |
75 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v |
76 |
retrieving revision 1.4 |
77 |
retrieving revision 1.5 |
78 |
diff -u -r1.4 -r1.5 |
79 |
--- ghc-7.8.3.ebuild 30 Jul 2014 13:20:16 -0000 1.4 |
80 |
+++ ghc-7.8.3.ebuild 1 Aug 2014 09:12:49 -0000 1.5 |
81 |
@@ -1,6 +1,6 @@ |
82 |
# Copyright 1999-2014 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.4 2014/07/30 13:20:16 slyfox Exp $ |
85 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.8.3.ebuild,v 1.5 2014/08/01 09:12:49 slyfox Exp $ |
86 |
|
87 |
EAPI=5 |
88 |
|
89 |
@@ -489,10 +489,10 @@ |
90 |
|
91 |
src_compile() { |
92 |
if ! use binary; then |
93 |
- # 1. build compiler binary(+wrapper) first |
94 |
- emake inplace/bin/ghc-stage2 |
95 |
+ # 1. build compiler binary first |
96 |
+ emake ghc/stage2/build/tmp/ghc-stage2 |
97 |
# 2. pax-mark (bug #516430) |
98 |
- pax-mark -m inplace/lib/bin/ghc-stage2 |
99 |
+ pax-mark -m ghc/stage2/build/tmp/ghc-stage2 |
100 |
# 3. and then all the rest |
101 |
emake all |
102 |
fi # ! use binary |
103 |
@@ -525,11 +525,6 @@ |
104 |
# remove link, but leave 'haddock-${GHC_P}' |
105 |
rm -f "${ED}"/usr/bin/haddock |
106 |
|
107 |
- # ghci uses mmap with rwx protection at it implements dynamic |
108 |
- # linking on it's own (bug #299709) |
109 |
- # so mark resulting binary |
110 |
- pax-mark -m "${ED}/usr/$(get_libdir)/${GHC_P}/bin/ghc" |
111 |
- |
112 |
if [[ ! -f "${S}/VERSION" ]]; then |
113 |
echo "${GHC_PV}" > "${S}/VERSION" \ |
114 |
|| die "Could not create file ${S}/VERSION" |
115 |
|
116 |
|
117 |
|
118 |
1.262 dev-lang/ghc/ChangeLog |
119 |
|
120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.262&view=markup |
121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?rev=1.262&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ghc/ChangeLog?r1=1.261&r2=1.262 |
123 |
|
124 |
Index: ChangeLog |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v |
127 |
retrieving revision 1.261 |
128 |
retrieving revision 1.262 |
129 |
diff -u -r1.261 -r1.262 |
130 |
--- ChangeLog 30 Jul 2014 13:20:16 -0000 1.261 |
131 |
+++ ChangeLog 1 Aug 2014 09:12:49 -0000 1.262 |
132 |
@@ -1,6 +1,10 @@ |
133 |
# ChangeLog for dev-lang/ghc |
134 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
135 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.261 2014/07/30 13:20:16 slyfox Exp $ |
136 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.262 2014/08/01 09:12:49 slyfox Exp $ |
137 |
+ |
138 |
+ 01 Aug 2014; Sergei Trofimovich <slyfox@g.o> ghc-7.6.3-r1.ebuild, |
139 |
+ ghc-7.8.3.ebuild: |
140 |
+ fix installation on PaX kernels (thanks to yangjay) |
141 |
|
142 |
30 Jul 2014; Sergei Trofimovich <slyfox@g.o> ghc-7.8.3.ebuild: |
143 |
Fix pax-marking command for final ghc binary. |