| 1 |
zlin 08/03/27 07:59:09 |
| 2 |
|
| 3 |
Modified: qt-unixODBC-3.3.8.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Respect user's CFLAGS (bug #181789). Fix quoting. Use doins. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.10 dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild?rev=1.10&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild?rev=1.10&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild?r1=1.9&r2=1.10 |
| 14 |
|
| 15 |
Index: qt-unixODBC-3.3.8.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild,v |
| 18 |
retrieving revision 1.9 |
| 19 |
retrieving revision 1.10 |
| 20 |
diff -u -r1.9 -r1.10 |
| 21 |
--- qt-unixODBC-3.3.8.ebuild 13 Jul 2007 06:38:59 -0000 1.9 |
| 22 |
+++ qt-unixODBC-3.3.8.ebuild 27 Mar 2008 07:59:09 -0000 1.10 |
| 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-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild,v 1.9 2007/07/13 06:38:59 mr_bones_ Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild,v 1.10 2008/03/27 07:59:09 zlin Exp $ |
| 29 |
|
| 30 |
inherit eutils |
| 31 |
|
| 32 |
@@ -13,7 +13,7 @@ |
| 33 |
SLOT="3" |
| 34 |
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" |
| 35 |
|
| 36 |
-DEPEND="~x11-libs/qt-$PV |
| 37 |
+DEPEND="~x11-libs/qt-${PV} |
| 38 |
dev-db/unixODBC" |
| 39 |
|
| 40 |
S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} |
| 41 |
@@ -24,12 +24,21 @@ |
| 42 |
|
| 43 |
src_unpack() { |
| 44 |
unpack ${A} |
| 45 |
- cd ${S} |
| 46 |
+ cd "${S}" |
| 47 |
|
| 48 |
- epatch ${FILESDIR}/qt-no-rpath.patch |
| 49 |
+ epatch "${FILESDIR}"/qt-no-rpath.patch |
| 50 |
|
| 51 |
cp configure configure.orig |
| 52 |
sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure |
| 53 |
+ |
| 54 |
+ sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 55 |
+ -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 56 |
+ -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 57 |
+ -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ |
| 58 |
+ -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ |
| 59 |
+ -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \ |
| 60 |
+ -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ |
| 61 |
+ "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed" |
| 62 |
} |
| 63 |
|
| 64 |
src_compile() { |
| 65 |
@@ -39,7 +48,7 @@ |
| 66 |
# Let's just allow writing to these directories during Qt emerge |
| 67 |
# as it makes Qt much happier. |
| 68 |
addwrite "${QTBASE}/etc/settings" |
| 69 |
- addwrite "$HOME/.qt" |
| 70 |
+ addwrite "${HOME}/.qt" |
| 71 |
|
| 72 |
export YACC='byacc -d' |
| 73 |
|
| 74 |
@@ -47,15 +56,13 @@ |
| 75 |
-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ |
| 76 |
-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ |
| 77 |
${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \ |
| 78 |
- -dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die |
| 79 |
- |
| 80 |
- export QTDIR=${S} |
| 81 |
+ -dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die "configure failed" |
| 82 |
|
| 83 |
- cd $S/plugins/src/sqldrivers/odbc |
| 84 |
- emake || die |
| 85 |
+ cd "${S}"/plugins/src/sqldrivers/odbc |
| 86 |
+ emake || die "emake failed" |
| 87 |
} |
| 88 |
|
| 89 |
src_install() { |
| 90 |
- mkdir -p $D/$QTBASE/plugins/sqldrivers |
| 91 |
- cp $S/plugins/sqldrivers/libqsqlodbc.so $D/$QTBASE/plugins/sqldrivers/ || die |
| 92 |
+ insinto ${QTBASE}/plugins/sqldrivers |
| 93 |
+ doins "${S}"/plugins/sqldrivers/libqsqlodbc.so || die "doins failed" |
| 94 |
} |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.37 dev-db/qt-unixODBC/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/ChangeLog?rev=1.37&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/ChangeLog?rev=1.37&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/qt-unixODBC/ChangeLog?r1=1.36&r2=1.37 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v |
| 107 |
retrieving revision 1.36 |
| 108 |
retrieving revision 1.37 |
| 109 |
diff -u -r1.36 -r1.37 |
| 110 |
--- ChangeLog 13 Mar 2008 17:02:35 -0000 1.36 |
| 111 |
+++ ChangeLog 27 Mar 2008 07:59:09 -0000 1.37 |
| 112 |
@@ -1,6 +1,10 @@ |
| 113 |
# ChangeLog for dev-db/qt-unixODBC |
| 114 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.36 2008/03/13 17:02:35 ricmm Exp $ |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.37 2008/03/27 07:59:09 zlin Exp $ |
| 117 |
+ |
| 118 |
+ 27 Mar 2008; Bo Ørsted Andresen <zlin@g.o> |
| 119 |
+ qt-unixODBC-3.3.8.ebuild: |
| 120 |
+ Respect user's CFLAGS (bug #181789). Fix quoting. Use doins. |
| 121 |
|
| 122 |
13 Mar 2008; <ricmm@g.o> qt-unixODBC-3.3.4-r1.ebuild: |
| 123 |
Drop to ~mips due to unstable deps |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
-- |
| 128 |
gentoo-commits@l.g.o mailing list |
Archives