| 1 |
ssuominen 10/02/24 12:49:01 |
| 2 |
|
| 3 |
Modified: ChangeLog log4cxx-0.10.0.ebuild |
| 4 |
Log: |
| 5 |
Fix building with unixODBC wrt #254920, thanks to David Klempner for reporting. |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.31 dev-libs/log4cxx/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/ChangeLog?rev=1.31&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/ChangeLog?rev=1.31&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/ChangeLog?r1=1.30&r2=1.31 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v |
| 18 |
retrieving revision 1.30 |
| 19 |
retrieving revision 1.31 |
| 20 |
diff -u -r1.30 -r1.31 |
| 21 |
--- ChangeLog 23 Dec 2009 16:14:08 -0000 1.30 |
| 22 |
+++ ChangeLog 24 Feb 2010 12:49:00 -0000 1.31 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-libs/log4cxx |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.30 2009/12/23 16:14:08 grobian Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.31 2010/02/24 12:49:00 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 24 Feb 2010; Samuli Suominen <ssuominen@g.o> log4cxx-0.10.0.ebuild, |
| 31 |
+ +files/log4cxx-0.10.0-unixODBC.patch: |
| 32 |
+ Fix building with unixODBC wrt #254920, thanks to David Klempner for |
| 33 |
+ reporting. |
| 34 |
|
| 35 |
23 Dec 2009; Fabian Groffen <grobian@g.o> log4cxx-0.10.0.ebuild: |
| 36 |
Marked ~amd64-linux and ~ppc-macos, bug #294614 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.7 dev-libs/log4cxx/log4cxx-0.10.0.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild?rev=1.7&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild?rev=1.7&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild?r1=1.6&r2=1.7 |
| 45 |
|
| 46 |
Index: log4cxx-0.10.0.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v |
| 49 |
retrieving revision 1.6 |
| 50 |
retrieving revision 1.7 |
| 51 |
diff -u -r1.6 -r1.7 |
| 52 |
--- log4cxx-0.10.0.ebuild 23 Dec 2009 16:14:08 -0000 1.6 |
| 53 |
+++ log4cxx-0.10.0.ebuild 24 Feb 2010 12:49:00 -0000 1.7 |
| 54 |
@@ -1,12 +1,11 @@ |
| 55 |
-# Copyright 1999-2009 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.6 2009/12/23 16:14:08 grobian Exp $ |
| 59 |
- |
| 60 |
-EAPI="1" |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.7 2010/02/24 12:49:00 ssuominen Exp $ |
| 62 |
|
| 63 |
+EAPI=2 |
| 64 |
inherit eutils |
| 65 |
|
| 66 |
-MY_P="apache-${P}" |
| 67 |
+MY_P=apache-${P} |
| 68 |
|
| 69 |
DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations" |
| 70 |
HOMEPAGE="http://logging.apache.org/log4cxx/" |
| 71 |
@@ -17,34 +16,32 @@ |
| 72 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos" |
| 73 |
IUSE="doc iodbc unicode odbc smtp" |
| 74 |
|
| 75 |
-RDEPEND="dev-libs/apr:1 |
| 76 |
+DEPEND="dev-libs/apr:1 |
| 77 |
dev-libs/apr-util:1 |
| 78 |
odbc? ( |
| 79 |
iodbc? ( >=dev-db/libiodbc-3.52.4 ) |
| 80 |
!iodbc? ( dev-db/unixODBC ) ) |
| 81 |
smtp? ( net-libs/libesmtp )" |
| 82 |
-DEPEND="${RDEPEND}" |
| 83 |
|
| 84 |
-S="${WORKDIR}/${MY_P}" |
| 85 |
+S=${WORKDIR}/${MY_P} |
| 86 |
|
| 87 |
pkg_setup() { |
| 88 |
- if use iodbc && ! use odbc ; then |
| 89 |
+ if use iodbc && ! use odbc; then |
| 90 |
elog "Please enable the odbc USE-flag as well if you want odbc-support through iodbc." |
| 91 |
fi |
| 92 |
} |
| 93 |
|
| 94 |
-src_unpack() { |
| 95 |
- unpack ${A} |
| 96 |
- cd "${S}" |
| 97 |
+src_prepare() { |
| 98 |
epatch "${FILESDIR}"/${PV}-missing_includes.patch \ |
| 99 |
- "${FILESDIR}"/${P}-gcc44.patch |
| 100 |
+ "${FILESDIR}"/${P}-gcc44.patch \ |
| 101 |
+ "${FILESDIR}"/${P}-unixODBC.patch |
| 102 |
} |
| 103 |
|
| 104 |
-src_compile() { |
| 105 |
+src_configure() { |
| 106 |
local myconf |
| 107 |
use smtp && myconf="${myconf} --with-SMTP=libesmtp" |
| 108 |
- if use odbc ; then |
| 109 |
- if use iodbc ; then |
| 110 |
+ if use odbc; then |
| 111 |
+ if use iodbc; then |
| 112 |
myconf="${myconf} --with-ODBC=iODBC" |
| 113 |
else |
| 114 |
myconf="${myconf} --with-ODBC=unixODBC" |
| 115 |
@@ -55,12 +52,11 @@ |
| 116 |
econf \ |
| 117 |
--disable-doxygen \ |
| 118 |
--disable-html-docs \ |
| 119 |
- ${myconf} || die "econf failed" |
| 120 |
- emake || die "emake failed" |
| 121 |
+ ${myconf} |
| 122 |
} |
| 123 |
|
| 124 |
src_install () { |
| 125 |
- emake DESTDIR="${D}" install || die "make install failed" |
| 126 |
+ emake DESTDIR="${D}" install || die |
| 127 |
dohtml -r site/* |
| 128 |
|
| 129 |
insinto /usr/share/doc/${PF}/examples |
Archives