| 1 |
nerdboy 11/09/03 00:49:46 |
| 2 |
|
| 3 |
Modified: ChangeLog doxygen-1.7.4.ebuild |
| 4 |
Log: |
| 5 |
More updates to force qmake to use the right config settings. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.204 app-doc/doxygen/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.204&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.204&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.203&r2=1.204 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
| 19 |
retrieving revision 1.203 |
| 20 |
retrieving revision 1.204 |
| 21 |
diff -u -r1.203 -r1.204 |
| 22 |
--- ChangeLog 9 Apr 2011 18:09:46 -0000 1.203 |
| 23 |
+++ ChangeLog 3 Sep 2011 00:49:45 -0000 1.204 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-doc/doxygen |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.203 2011/04/09 18:09:46 nerdboy Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.204 2011/09/03 00:49:45 nerdboy Exp $ |
| 29 |
+ |
| 30 |
+ 03 Sep 2011; Steve Arnold <nerdboy@g.o> doxygen-1.7.4.ebuild: |
| 31 |
+ More updates to force qmake to use the right config settings; should |
| 32 |
+ also fix bug #378963. Qmake could really use a nice eclass... |
| 33 |
|
| 34 |
*doxygen-1.7.4 (09 Apr 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 app-doc/doxygen/doxygen-1.7.4.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: doxygen-1.7.4.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- doxygen-1.7.4.ebuild 9 Apr 2011 18:09:46 -0000 1.1 |
| 52 |
+++ doxygen-1.7.4.ebuild 3 Sep 2011 00:49:45 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.1 2011/04/09 18:09:46 nerdboy Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.2 2011/09/03 00:49:45 nerdboy Exp $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
@@ -62,6 +62,10 @@ |
| 62 |
sed -i.orig -e "s:g_kowal:g kowal:" \ |
| 63 |
doc/maintainers.txt || die "sed 3 failed" |
| 64 |
|
| 65 |
+ # fix qmake spec problem |
| 66 |
+# sed -i.orig -e "s:spec macx-g++:spec gentoo:" \ |
| 67 |
+# addon/doxywizard/Makefile || die "sed 4 failed" |
| 68 |
+ |
| 69 |
# add native TCL support |
| 70 |
use tcl && epatch "${WORKDIR}"/${PN}-1.7-tcl_support.patch |
| 71 |
|
| 72 |
@@ -104,16 +108,18 @@ |
| 73 |
} |
| 74 |
|
| 75 |
src_compile() { |
| 76 |
- CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ |
| 77 |
- emake all || die 'emake failed' |
| 78 |
|
| 79 |
- # force stupid qmake to use LDFLAGS - yes, it's a big kluge... |
| 80 |
+ # force stupid qmake to behave - yes, it's a big kluge... |
| 81 |
if use qt4 ; then |
| 82 |
- rm -f bin/doxywizard |
| 83 |
sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \ |
| 84 |
- addon/doxywizard/Makefile.doxywizard |
| 85 |
- make -C addon/doxywizard |
| 86 |
+ -e "s|= g++|= $(tc-getCXX)|" \ |
| 87 |
+ -e "s|usr/local/Qt4.6|usr/share/qt4|g" \ |
| 88 |
+ -e "s|macx-g++ -macx|linux-g++|" \ |
| 89 |
+ addon/doxywizard/Makefile.doxywizard \ |
| 90 |
+ || die "qmake sed hack failed" |
| 91 |
fi |
| 92 |
+ CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \ |
| 93 |
+ emake all || die 'emake failed' |
| 94 |
|
| 95 |
# generate html and pdf (if tetex in use) documents. |
| 96 |
# errors here are not considered fatal, hence the ewarn message |
Archives