1 |
pappy 08/04/28 12:15:29 |
2 |
|
3 |
Modified: hardened-glibc-2.6.1-r1.ebuild ChangeLog |
4 |
Log: |
5 |
updated ebuild with fixes for locale-gen and nscd, changed march and mtune |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.4 sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild?rev=1.4&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild?rev=1.4&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild?r1=1.3&r2=1.4 |
14 |
|
15 |
Index: hardened-glibc-2.6.1-r1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild,v |
18 |
retrieving revision 1.3 |
19 |
retrieving revision 1.4 |
20 |
diff -u -r1.3 -r1.4 |
21 |
--- hardened-glibc-2.6.1-r1.ebuild 28 Apr 2008 00:22:07 -0000 1.3 |
22 |
+++ hardened-glibc-2.6.1-r1.ebuild 28 Apr 2008 12:15:29 -0000 1.4 |
23 |
@@ -1,8 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild,v 1.3 2008/04/28 00:22:07 pappy Exp $ |
27 |
- |
28 |
-inherit eutils |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/hardened-glibc-2.6.1-r1.ebuild,v 1.4 2008/04/28 12:15:29 pappy Exp $ |
30 |
|
31 |
# the main installation routine and patches |
32 |
# from http://www.linuxfromscratch.org/hlfs |
33 |
@@ -17,12 +15,22 @@ |
34 |
|
35 |
PATCHDIST="http://dev.gentoo.org/~pappy/dist/hardened" |
36 |
PATCHPATH="sys-libs/hardened-glibc/files/2.6.1" |
37 |
-GENTOOPATCHES="glibc-2.6.1-GENTOOPATCHES.patch.gz" |
38 |
+MYPATCHES="glibc-2.6.1-GENTOOPATCHES.patch.gz" |
39 |
+LOCALEGEN="glibc-2.6.1-LOCALEGEN_NSCD.patch.gz" |
40 |
|
41 |
+## the default upstream glibc |
42 |
SRC_URI="${SRC_URI} \ |
43 |
${GNU_MIRROR}/glibc/glibc-2.6.1.tar.bz2" |
44 |
+ |
45 |
+## contains a jumbo file with all patches from |
46 |
+## sys-libs/glibc for this particular glibc setup |
47 |
+SRC_URI="${SRC_URI} \ |
48 |
+ ${PATCHDIST}/${PATCHPATH}/${MYPATCHES}" |
49 |
+ |
50 |
+## contains the locale-gen utility from Debian |
51 |
+## taken from sys-libs/glibc |
52 |
SRC_URI="${SRC_URI} \ |
53 |
- ${PATCHDIST}/${PATCHPATH}/${GENTOOPATCHES}" |
54 |
+ ${PATCHDIST}/${PATCHPATH}/${LOCALEGEN}" |
55 |
|
56 |
LICENSE="LGPL-2" |
57 |
SLOT="1" |
58 |
@@ -31,7 +39,7 @@ |
59 |
## /var/tmp/portage/sys-libs/hardened-glibc-2.6.1-r1/ |
60 |
## work/glibc-2.6.1/gentoo/locale/locale-gen does not exist |
61 |
|
62 |
-KEYWORDS="-x86" |
63 |
+KEYWORDS="~x86" |
64 |
IUSE="" |
65 |
|
66 |
PROVIDE="virtual/libc" |
67 |
@@ -50,9 +58,12 @@ |
68 |
# hardcoding the CHOST in this ebuild (for x86 stages) |
69 |
export CHOST="i486-pc-linux-gnu" |
70 |
|
71 |
- # CFLAGS+="-march=i686" for undefined reference to |
72 |
- # `__sync_bool_compare_and_swap_4' |
73 |
- export CFLAGS="-O2 -pipe -march=i686" |
74 |
+ # need CFLAGS+="-march=i486" for |
75 |
+ # undefined reference |
76 |
+ # to `__sync_bool_compare_and_swap_4' |
77 |
+ # error message, |
78 |
+ # lets hope mtuning for i686 cpu gives some speed |
79 |
+ export CFLAGS="-O2 -pipe -march=i486 -mtune=i686 -fforce-addr" |
80 |
export CXXFLAGS="${CFLAGS}" |
81 |
|
82 |
export CPPFLAGS="" |
83 |
@@ -72,7 +83,14 @@ |
84 |
src_compile() { |
85 |
cd "${WORKDIR}/glibc-${PV}" |
86 |
|
87 |
- epatch "${WORKDIR}/glibc-2.6.1-GENTOOPATCHES.patch" |
88 |
+ einfo "adding gentoo glibc patches" |
89 |
+ patch --quiet -p1 < "${WORKDIR}/glibc-2.6.1-GENTOOPATCHES.patch" || \ |
90 |
+ die "gentoo patches" |
91 |
+ |
92 |
+ # somehow epatch would not apply this :( |
93 |
+ einfo "adding localegen utility and nscd files" |
94 |
+ patch --quiet -p1 < "${WORKDIR}/glibc-2.6.1-LOCALEGEN_NSCD.patch" || \ |
95 |
+ die "localegen patch" |
96 |
|
97 |
mkdir -p "${WORKDIR}/glibc-build" |
98 |
cd "${WORKDIR}/glibc-build" |
99 |
|
100 |
|
101 |
|
102 |
1.3 sys-libs/hardened-glibc/ChangeLog |
103 |
|
104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/ChangeLog?rev=1.3&view=markup |
105 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/ChangeLog?rev=1.3&content-type=text/plain |
106 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/hardened-glibc/ChangeLog?r1=1.2&r2=1.3 |
107 |
|
108 |
Index: ChangeLog |
109 |
=================================================================== |
110 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/ChangeLog,v |
111 |
retrieving revision 1.2 |
112 |
retrieving revision 1.3 |
113 |
diff -u -r1.2 -r1.3 |
114 |
--- ChangeLog 27 Apr 2008 23:19:48 -0000 1.2 |
115 |
+++ ChangeLog 28 Apr 2008 12:15:29 -0000 1.3 |
116 |
@@ -1,9 +1,12 @@ |
117 |
# ChangeLog for sys-libs/hardened-glibc |
118 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
119 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/ChangeLog,v 1.2 2008/04/27 23:19:48 pappy Exp $ |
120 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/hardened-glibc/ChangeLog,v 1.3 2008/04/28 12:15:29 pappy Exp $ |
121 |
+ |
122 |
+ 28 Apr 2008; <pappy@g.o> hardened-glibc-2.6.1-r1.ebuild: |
123 |
+ fixed built time failures and added locale-gen and nscd config files |
124 |
|
125 |
27 Apr 2008; <pappy@g.o> ChangeLog: |
126 |
- hardened-glibc-2.6.1-r1.ebuild |
127 |
+ added hardened-glibc-2.6.1-r1.ebuild |
128 |
|
129 |
27 Apr 2008; <pappy@g.o> ChangeLog: |
130 |
these are test versions for hardened developers |
131 |
|
132 |
|
133 |
|
134 |
-- |
135 |
gentoo-commits@l.g.o mailing list |