Lines 23-29
Link Here
|
23 |
#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version. |
23 |
#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version. |
24 |
#Thus we need to detect presently installed one and bootstrap in one or two stages.. |
24 |
#Thus we need to detect presently installed one and bootstrap in one or two stages.. |
25 |
|
25 |
|
26 |
inherit base |
26 |
inherit base flag-o-matic |
27 |
|
27 |
|
28 |
IUSE="doc tetex opengl" |
28 |
IUSE="doc tetex opengl" |
29 |
|
29 |
|
Lines 73-80
Link Here
|
73 |
# hardened-gcc needs to be disabled, because the |
73 |
# hardened-gcc needs to be disabled, because the |
74 |
# mangler doesn't accept its output; yes, the 6.2 version |
74 |
# mangler doesn't accept its output; yes, the 6.2 version |
75 |
# should do ... |
75 |
# should do ... |
76 |
cd ${S} |
76 |
if has_spp; then |
77 |
bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p1 |
77 |
cd ${S} |
|
|
78 |
bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p1 |
79 |
fi |
80 |
|
78 |
pushd ghc/compiler/ghci |
81 |
pushd ghc/compiler/ghci |
79 |
bzcat ${FILESDIR}/ghc-6.2.1-linker.patch.bz2 | patch -p0 |
82 |
bzcat ${FILESDIR}/ghc-6.2.1-linker.patch.bz2 | patch -p0 |
80 |
popd |
83 |
popd |
Lines 91-98
Link Here
|
91 |
# (this is still necessary, even though we have the patch, because |
94 |
# (this is still necessary, even though we have the patch, because |
92 |
# we might be bootstrapping from a version that didn't have the |
95 |
# we might be bootstrapping from a version that didn't have the |
93 |
# patch included) |
96 |
# patch included) |
94 |
echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk |
97 |
opts="" |
95 |
echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk |
98 |
if has_pic; then |
|
|
99 |
opts="-fno-pic" |
100 |
fi |
101 |
|
102 |
if has_ssp; then |
103 |
opts="-fno-stack-protector ${opts}" |
104 |
fi |
105 |
|
106 |
echo "SRC_CC_OPTS+=${opts}" >> mk/build.mk |
107 |
echo "SRC_HC_OPTS+=${opts//-f/-optc-f}" >> mk/build.mk |
96 |
|
108 |
|
97 |
# force the config variable ArSupportsInput to be unset; |
109 |
# force the config variable ArSupportsInput to be unset; |
98 |
# ar in binutils >= 2.14.90.0.8-r1 seems to be classified |
110 |
# ar in binutils >= 2.14.90.0.8-r1 seems to be classified |