1 |
wired 10/10/07 23:08:03 |
2 |
|
3 |
Modified: ChangeLog doxygen-1.5.8-r1.ebuild |
4 |
Log: |
5 |
only call eqmake4 if use qt4, bug #340092 |
6 |
|
7 |
(Portage version: 2.2_rc89/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.182 app-doc/doxygen/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.182&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.182&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.181&r2=1.182 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
19 |
retrieving revision 1.181 |
20 |
retrieving revision 1.182 |
21 |
diff -u -r1.181 -r1.182 |
22 |
--- ChangeLog 4 Oct 2010 06:10:38 -0000 1.181 |
23 |
+++ ChangeLog 7 Oct 2010 23:08:03 -0000 1.182 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for app-doc/doxygen |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.181 2010/10/04 06:10:38 nerdboy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.182 2010/10/07 23:08:03 wired Exp $ |
29 |
+ |
30 |
+ 07 Oct 2010; Alex Alexander <wired@g.o> doxygen-1.5.8-r1.ebuild: |
31 |
+ only call eqmake4 if use qt4, bug #340092 |
32 |
|
33 |
04 Oct 2010; Steve Arnold <nerdboy@g.o> doxygen-1.5.8-r1.ebuild: |
34 |
Needed additional updates to pick up the qt4 qmake config correctly. |
35 |
|
36 |
|
37 |
|
38 |
1.10 app-doc/doxygen/doxygen-1.5.8-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?rev=1.10&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?rev=1.10&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild?r1=1.9&r2=1.10 |
43 |
|
44 |
Index: doxygen-1.5.8-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v |
47 |
retrieving revision 1.9 |
48 |
retrieving revision 1.10 |
49 |
diff -u -r1.9 -r1.10 |
50 |
--- doxygen-1.5.8-r1.ebuild 4 Oct 2010 06:10:38 -0000 1.9 |
51 |
+++ doxygen-1.5.8-r1.ebuild 7 Oct 2010 23:08:03 -0000 1.10 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.9 2010/10/04 06:10:38 nerdboy Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.10 2010/10/07 23:08:03 wired Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
|
60 |
@@ -98,14 +98,13 @@ |
61 |
export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" |
62 |
./configure ${my_conf} $(use_with qt4 doxywizard) \ |
63 |
|| die 'configure with qt4 failed' |
64 |
+ # this appears to work as a fix for the final ignoring LDFLAGS issue... |
65 |
+ pushd "${S}"/addon/doxywizard |
66 |
+ eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard |
67 |
+ popd |
68 |
else |
69 |
./configure ${my_conf} || die 'configure failed' |
70 |
fi |
71 |
- |
72 |
- # this appears to work as a fix for the final ignoring LDFLAGS issue... |
73 |
- pushd "${S}"/addon/doxywizard |
74 |
- eqmake4 "CONFIG+=nostrip" doxywizard.pro -o Makefile.doxywizard |
75 |
- popd |
76 |
} |
77 |
|
78 |
src_compile() { |