1 |
solar 09/01/02 19:50:48 |
2 |
|
3 |
Modified: uclibc-0.9.30.ebuild ChangeLog metadata.xml |
4 |
Log: |
5 |
- work around gcc-4 lack of ssp by default support while +hardened is enabled |
6 |
(Portage version: 2.1.4.5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 sys-libs/uclibc/uclibc-0.9.30.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: uclibc-0.9.30.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- uclibc-0.9.30.ebuild 28 Nov 2008 20:09:45 -0000 1.1 |
22 |
+++ uclibc-0.9.30.ebuild 2 Jan 2009 19:50:47 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2008 Gentoo Foundation |
25 |
+# Copyright 1999-2009 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.1 2008/11/28 20:09:45 solar Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.ebuild,v 1.2 2009/01/02 19:50:47 solar Exp $ |
29 |
|
30 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
31 |
#inherit subversion |
32 |
@@ -21,7 +21,7 @@ |
33 |
|
34 |
MY_P=uClibc-0.9.30 |
35 |
SVN_VER="" |
36 |
-#PATCH_VER="0.1" |
37 |
+PATCH_VER="1.0" |
38 |
DESCRIPTION="C library for developing embedded Linux systems" |
39 |
HOMEPAGE="http://www.uclibc.org/" |
40 |
SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2 |
41 |
@@ -33,20 +33,20 @@ |
42 |
SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2" |
43 |
|
44 |
LICENSE="LGPL-2" |
45 |
-[[ ${CTARGET} != ${CHOST} ]] \ |
46 |
- && SLOT="${CTARGET}" \ |
47 |
- || SLOT="0" |
48 |
+SLOT="0" |
49 |
KEYWORDS="-* ~arm ~m68k -mips ~ppc ~sh ~sparc ~x86 ~amd64" |
50 |
-IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp crosscompile_opts_headers-only" |
51 |
+IUSE="build uclibc-compat debug hardened ssp iconv ipv6 minimal nls pregen userlocales wordexp crosscompile_opts_headers-only" |
52 |
RESTRICT="strip" |
53 |
|
54 |
RDEPEND="" |
55 |
if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then |
56 |
DEPEND="" |
57 |
PROVIDE="" |
58 |
+ SLOT="${CTARGET}" |
59 |
else |
60 |
DEPEND="virtual/os-headers app-misc/pax-utils" |
61 |
PROVIDE="virtual/libc" |
62 |
+ SLOT="0" |
63 |
fi |
64 |
|
65 |
S=${WORKDIR}/${MY_P} |
66 |
@@ -60,6 +60,7 @@ |
67 |
echo /usr/${CTARGET}/usr/include |
68 |
fi |
69 |
} |
70 |
+ |
71 |
just_headers() { |
72 |
use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] |
73 |
} |
74 |
@@ -186,19 +187,6 @@ |
75 |
unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2 |
76 |
EPATCH_SUFFIX="patch" |
77 |
epatch "${WORKDIR}"/patch |
78 |
- # math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f) |
79 |
- cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die |
80 |
- epatch "${WORKDIR}"/patch/math |
81 |
- fi |
82 |
- |
83 |
- if [[ -d "${FILESDIR}"/patches-${PV} ]] ; then |
84 |
- EPATCH_SUFFIX="patch" |
85 |
- epatch "${FILESDIR}"/patches-${PV} |
86 |
- if [[ -d "${FILESDIR}"/patches-${PV}/math/libm ]] ; then |
87 |
- # math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f) |
88 |
- cp "${FILESDIR}"/patches-${PV}/math/libm/* "${S}"/libm/ || die |
89 |
- epatch "${FILESDIR}"/patches-${PV}/math |
90 |
- fi |
91 |
fi |
92 |
|
93 |
########## CPU SELECTION ########## |
94 |
@@ -248,7 +236,7 @@ |
95 |
local moredefs="COMPAT_ATEXIT" |
96 |
local compat_sym=atexit |
97 |
|
98 |
- # We need todo this for a few months. .29 is a major upgrade. |
99 |
+ # We need todo this for a few months. .30 is a major upgrade. |
100 |
# Don't do it from cross-compiling case though |
101 |
if ! use uclibc-compat ; then |
102 |
if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \ |
103 |
@@ -288,7 +276,7 @@ |
104 |
set_opt UCLIBC_HAS_GETTEXT_AWARENESS n |
105 |
fi |
106 |
|
107 |
- if use pregen ; then |
108 |
+ if use pregen && [[ ${target} != mips ]]; then |
109 |
set_opt UCLIBC_PREGENERATED_LOCALE_DATA y |
110 |
set_opt UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA y |
111 |
if use userlocales ; then |
112 |
@@ -321,8 +309,7 @@ |
113 |
# arm/mips do not emit PT_GNU_STACK, but if we enable this here |
114 |
# it will be emitted as RWE, ppc has to be checked, x86 needs it |
115 |
# this option should be used independently of hardened |
116 |
- # relro could be also moved out of hardened |
117 |
- if has $(tc-arch) x86 ; then |
118 |
+ if has $(tc-arch) x86 || has $(tc-arch) ppc; then |
119 |
set_opt UCLIBC_BUILD_NOEXECSTACK y |
120 |
else |
121 |
set_opt UCLIBC_BUILD_NOEXECSTACK n |
122 |
@@ -334,9 +321,11 @@ |
123 |
else |
124 |
set_opt UCLIBC_BUILD_PIE n |
125 |
fi |
126 |
- set_opt SSP_QUICK_CANARY n |
127 |
- set_opt UCLIBC_BUILD_SSP y |
128 |
set_opt UCLIBC_BUILD_NOW y |
129 |
+ use ssp && { |
130 |
+ set_opt SSP_QUICK_CANARY n |
131 |
+ set_opt UCLIBC_BUILD_SSP y |
132 |
+ } |
133 |
else |
134 |
set_opt UCLIBC_BUILD_PIE n |
135 |
set_opt SSP_QUICK_CANARY y |
136 |
|
137 |
|
138 |
|
139 |
1.42 sys-libs/uclibc/ChangeLog |
140 |
|
141 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.42&view=markup |
142 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.42&content-type=text/plain |
143 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?r1=1.41&r2=1.42 |
144 |
|
145 |
Index: ChangeLog |
146 |
=================================================================== |
147 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v |
148 |
retrieving revision 1.41 |
149 |
retrieving revision 1.42 |
150 |
diff -u -r1.41 -r1.42 |
151 |
--- ChangeLog 28 Nov 2008 20:09:45 -0000 1.41 |
152 |
+++ ChangeLog 2 Jan 2009 19:50:47 -0000 1.42 |
153 |
@@ -1,6 +1,9 @@ |
154 |
# ChangeLog for sys-libs/uclibc |
155 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
156 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.41 2008/11/28 20:09:45 solar Exp $ |
157 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
158 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.42 2009/01/02 19:50:47 solar Exp $ |
159 |
+ |
160 |
+ 02 Jan 2009; <solar@g.o> metadata.xml, uclibc-0.9.30.ebuild: |
161 |
+ work around gcc-4 lack of ssp by default support while +hardened is enabled |
162 |
|
163 |
*uclibc-0.9.30 (28 Nov 2008) |
164 |
|
165 |
|
166 |
|
167 |
|
168 |
1.3 sys-libs/uclibc/metadata.xml |
169 |
|
170 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/metadata.xml?rev=1.3&view=markup |
171 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/metadata.xml?rev=1.3&content-type=text/plain |
172 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/metadata.xml?r1=1.2&r2=1.3 |
173 |
|
174 |
Index: metadata.xml |
175 |
=================================================================== |
176 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/metadata.xml,v |
177 |
retrieving revision 1.2 |
178 |
retrieving revision 1.3 |
179 |
diff -u -r1.2 -r1.3 |
180 |
--- metadata.xml 23 Aug 2008 03:32:16 -0000 1.2 |
181 |
+++ metadata.xml 2 Jan 2009 19:50:48 -0000 1.3 |
182 |
@@ -20,6 +20,7 @@ |
183 |
SH, SPARC, and v850 processors. |
184 |
</longdescription> |
185 |
<use> |
186 |
+ <flag name='ssp'>Force the use of ssp to be built into a hardened uclibc setup</flag> |
187 |
<flag name='pregen'>Use pregenerated locales</flag> |
188 |
<flag name='savedconfig'>Adds support for user defined configs</flag> |
189 |
<flag name='uclibc-compat'>Build uclibc with backwards compatible |