Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 59709 | Differences between
and this patch

Collapse All | Expand All

(-)ghc-6.2.1-r1.ebuild.orig (-3 / +16 lines)
Lines 74-80 Link Here
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
	cd ${S}
77
	bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p1
77
78
	if use ppc
79
	then
80
		bzcat ${FILESDIR}/ghc-6.2.hardened-ppc.patch.bz2 | patch -p1
81
	else
82
		bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p1
83
	fi
84
78
	pushd ghc/compiler/ghci
85
	pushd ghc/compiler/ghci
79
	bzcat ${FILESDIR}/ghc-6.2.1-linker.patch.bz2 | patch -p0
86
	bzcat ${FILESDIR}/ghc-6.2.1-linker.patch.bz2 | patch -p0
80
	popd
87
	popd
Lines 91-98 Link Here
91
	# (this is still necessary, even though we have the patch, because
98
	# (this is still necessary, even though we have the patch, because
92
	# we might be bootstrapping from a version that didn't have the
99
	# we might be bootstrapping from a version that didn't have the
93
	# patch included)
100
	# patch included)
94
	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
101
	if use ppc;
95
	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
102
	then
103
		echo "SRC_CC_OPTS+=-fno-pic" >> mk/build.mk
104
		echo "SRC_HC_OPTS+=-optc-fno-pic" >> mk/build.mk
105
	else
106
		echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
107
		echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
108
	fi
96
109
97
	# force the config variable ArSupportsInput to be unset;
110
	# force the config variable ArSupportsInput to be unset;
98
	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
111
	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified

Return to bug 59709