1 |
alonbl 08/05/02 07:34:41 |
2 |
|
3 |
Modified: botan-1.6.1-r1.ebuild ChangeLog |
4 |
Log: |
5 |
Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix g++ CHOST usage |
6 |
(Portage version: 2.1.5_rc6) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 dev-libs/botan/botan-1.6.1-r1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: botan-1.6.1-r1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- botan-1.6.1-r1.ebuild 11 Nov 2007 04:12:38 -0000 1.4 |
22 |
+++ botan-1.6.1-r1.ebuild 2 May 2008 07:34:41 -0000 1.5 |
23 |
@@ -1,6 +1,6 @@ |
24 |
-# Copyright 1999-2007 Gentoo Foundation |
25 |
+# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.4 2007/11/11 04:12:38 cla Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.5 2008/05/02 07:34:41 alonbl Exp $ |
29 |
|
30 |
inherit eutils multilib |
31 |
|
32 |
@@ -31,6 +31,7 @@ |
33 |
unpack ${A} |
34 |
cd "${S}" |
35 |
epatch "${FILESDIR}/${P}-asm.patch" |
36 |
+ epatch "${FILESDIR}/${P}-gcc-4.2.patch" |
37 |
} |
38 |
|
39 |
src_compile() { |
40 |
@@ -73,11 +74,13 @@ |
41 |
|
42 |
# FIXME: We might actually be on *BSD or OS X... |
43 |
./configure.pl \ |
44 |
- --noauto gcc-linux-${CHOSTARCH} \ |
45 |
+ --noauto \ |
46 |
--libdir=/$(get_libdir) \ |
47 |
- --modules=$modules || |
48 |
- die "configure.pl failed" |
49 |
- emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed" |
50 |
+ --modules=$modules \ |
51 |
+ gcc-linux-${CHOSTARCH} || |
52 |
+ die "configure.pl failed" |
53 |
+ emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" \ |
54 |
+ "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed" |
55 |
} |
56 |
|
57 |
src_test() { |
58 |
|
59 |
|
60 |
|
61 |
1.31 dev-libs/botan/ChangeLog |
62 |
|
63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.31&view=markup |
64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.31&content-type=text/plain |
65 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?r1=1.30&r2=1.31 |
66 |
|
67 |
Index: ChangeLog |
68 |
=================================================================== |
69 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v |
70 |
retrieving revision 1.30 |
71 |
retrieving revision 1.31 |
72 |
diff -u -r1.30 -r1.31 |
73 |
--- ChangeLog 11 Nov 2007 05:40:38 -0000 1.30 |
74 |
+++ ChangeLog 2 May 2008 07:34:41 -0000 1.31 |
75 |
@@ -1,6 +1,11 @@ |
76 |
# ChangeLog for dev-libs/botan |
77 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
78 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.30 2007/11/11 05:40:38 alonbl Exp $ |
79 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
80 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.31 2008/05/02 07:34:41 alonbl Exp $ |
81 |
+ |
82 |
+ 02 May 2008; Alon Bar-Lev <alonbl@g.o> |
83 |
+ +files/botan-1.6.1-gcc-4.2.patch, botan-1.6.1-r1.ebuild: |
84 |
+ Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix |
85 |
+ g++ CHOST usage |
86 |
|
87 |
11 Nov 2007; Alon Bar-Lev <alonbl@g.o> -botan-1.6.1.ebuild: |
88 |
Cleanup |
89 |
|
90 |
|
91 |
|
92 |
-- |
93 |
gentoo-commits@l.g.o mailing list |