1 |
vapier 10/07/05 22:22:20 |
2 |
|
3 |
Modified: toolchain.eclass |
4 |
Log: |
5 |
eat trailing whitespace |
6 |
|
7 |
Revision Changes Path |
8 |
1.433 eclass/toolchain.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.433&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.433&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.432&r2=1.433 |
13 |
|
14 |
Index: toolchain.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
17 |
retrieving revision 1.432 |
18 |
retrieving revision 1.433 |
19 |
diff -u -r1.432 -r1.433 |
20 |
--- toolchain.eclass 4 Jul 2010 01:44:11 -0000 1.432 |
21 |
+++ toolchain.eclass 5 Jul 2010 22:22:20 -0000 1.433 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2008 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.432 2010/07/04 01:44:11 zorry Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.433 2010/07/05 22:22:20 vapier Exp $ |
27 |
# |
28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
29 |
|
30 |
@@ -248,7 +248,7 @@ |
31 |
# SPECS_GCC_VER |
32 |
# This is for the minispecs files included in the hardened gcc-4.x |
33 |
# The specs files for hardenedno*, vanilla and for building the "specs" file. |
34 |
-# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER |
35 |
+# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER |
36 |
# the gcc version of the patch. |
37 |
# An example: |
38 |
# SPECS_VER="8.7.6.5" |
39 |
@@ -345,7 +345,7 @@ |
40 |
[[ -n ${PIE_VER} ]] && \ |
41 |
PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \ |
42 |
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls ${PIE_CORE})" |
43 |
- |
44 |
+ |
45 |
# gcc minispec for the hardened gcc 4 compiler |
46 |
[[ -n ${SPECS_VER} ]] && \ |
47 |
GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)" |
48 |
@@ -754,10 +754,10 @@ |
49 |
if hardened_gcc_works ; then |
50 |
create_gcc_env_entry hardenednopiessp |
51 |
fi |
52 |
- if hardened_gcc_works pie ; then |
53 |
+ if hardened_gcc_works pie ; then |
54 |
create_gcc_env_entry hardenednopie |
55 |
fi |
56 |
- if hardened_gcc_works ssp ; then |
57 |
+ if hardened_gcc_works ssp ; then |
58 |
create_gcc_env_entry hardenednossp |
59 |
fi |
60 |
create_gcc_env_entry vanilla |
61 |
@@ -770,7 +770,7 @@ |
62 |
$(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs |
63 |
cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs |
64 |
doins "${WORKDIR}"/specs/specs || die "failed to install the specs file" |
65 |
- fi |
66 |
+ fi |
67 |
} |
68 |
add_profile_eselect_conf() { |
69 |
local compiler_config_file=$1 |
70 |
@@ -1267,8 +1267,8 @@ |
71 |
# |
72 |
# --with-python-dir=DIR |
73 |
# Specifies where to install the Python modules used for aot-compile. DIR |
74 |
- # should not include the prefix used in installation. For example, if the |
75 |
- # Python modules are to be installed in /usr/lib/python2.5/site-packages, |
76 |
+ # should not include the prefix used in installation. For example, if the |
77 |
+ # Python modules are to be installed in /usr/lib/python2.5/site-packages, |
78 |
# then –with-python-dir=/lib/python2.5/site-packages should be passed. |
79 |
# |
80 |
# This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python" |
81 |
@@ -1748,7 +1748,7 @@ |
82 |
einfo "CFLAGS=\"${CFLAGS}\"" |
83 |
einfo "CXXFLAGS=\"${CXXFLAGS}\"" |
84 |
|
85 |
- # For hardened gcc 4.3 piepatchset to build the hardened specs |
86 |
+ # For hardened gcc 4.3 piepatchset to build the hardened specs |
87 |
# file (build.specs) to use when building gcc. |
88 |
if ! tc_version_is_at_least 4.4 && want_minispecs ; then |
89 |
setup_minispecs_gcc_build_specs |