1 |
markusle 10/02/27 05:28:17 |
2 |
|
3 |
Modified: ChangeLog gdl-0.9_rc4.ebuild |
4 |
Log: |
5 |
Fixed libantlr issue (see bug #286630). |
6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.19 dev-lang/gdl/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.19&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.19&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/ChangeLog?r1=1.18&r2=1.19 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v |
18 |
retrieving revision 1.18 |
19 |
retrieving revision 1.19 |
20 |
diff -u -r1.18 -r1.19 |
21 |
--- ChangeLog 27 Feb 2010 05:03:45 -0000 1.18 |
22 |
+++ ChangeLog 27 Feb 2010 05:28:16 -0000 1.19 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for dev-lang/gdl |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.18 2010/02/27 05:03:45 markusle Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.19 2010/02/27 05:28:16 markusle Exp $ |
28 |
+ |
29 |
+ 27 Feb 2010; Markus Dittrich <markusle@g.o> gdl-0.9_rc4.ebuild, |
30 |
+ files/gdl-0.9_rc4-antlr.patch: |
31 |
+ Fixed libantlr issue (see bug #286630). |
32 |
+ Thanks much to Jan Kohnert for tracking this down. |
33 |
|
34 |
27 Feb 2010; Markus Dittrich <markusle@g.o> gdl-0.9_rc4.ebuild, |
35 |
+files/gdl-0.9_rc4-gcc4.3.patch: |
36 |
|
37 |
|
38 |
|
39 |
1.5 dev-lang/gdl/gdl-0.9_rc4.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: gdl-0.9_rc4.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- gdl-0.9_rc4.ebuild 27 Feb 2010 05:03:45 -0000 1.4 |
52 |
+++ gdl-0.9_rc4.ebuild 27 Feb 2010 05:28:16 -0000 1.5 |
53 |
@@ -1,10 +1,10 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.4 2010/02/27 05:03:45 markusle Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.5 2010/02/27 05:28:16 markusle Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
-inherit eutils flag-o-matic autotools |
62 |
+inherit eutils flag-o-matic autotools multilib |
63 |
|
64 |
MYP=${P/_/} |
65 |
DESCRIPTION="An Interactive Data Language compatible incremental compiler" |
66 |
@@ -46,6 +46,12 @@ |
67 |
# adjust the *.pro file install path |
68 |
sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \ |
69 |
|| die "Failed to fix *.pro install patch." |
70 |
+ |
71 |
+ # set path to libantlr. Note that we need to explicitly link against |
72 |
+ # libantlr.a since kde-sdk provides libantlr.so which we can not |
73 |
+ # use (see bug #286630). |
74 |
+ sed -i -e "s:ANTLR_LIB:/usr/$(get_libdir)/libantlr.a:" src/Makefile.am \ |
75 |
+ || die "Failed to adjust link to libantlr." |
76 |
eautoreconf |
77 |
} |