From e1b87f32d1113a228fc68686a2ff2d0c211e1e16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Thu, 15 Mar 2007 22:48:29 +0000 Subject: [PATCH] Added patch to fix compilation problems for projects depending on log4cxx (bug #162523, thanks to Pedro). Dropped old versions. Package-Manager: portage-2.1.2.2 --- dev-libs/log4cxx/ChangeLog | 10 ++- dev-libs/log4cxx/Manifest | 56 +++++++++-------- dev-libs/log4cxx/files/digest-log4cxx-0.9.5 | 3 - ...g4cxx-0.9.7-r2 => digest-log4cxx-0.9.7-r4} | 0 .../files/log4cxx-0.9.5-fix-errno.diff | 24 ------- .../log4cxx/files/log4cxx-0.9.7-tchar.patch | 12 ++++ dev-libs/log4cxx/log4cxx-0.9.5.ebuild | 35 ----------- dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild | 4 +- ....9.7-r2.ebuild => log4cxx-0.9.7-r4.ebuild} | 62 +++++++++++++------ 9 files changed, 95 insertions(+), 111 deletions(-) delete mode 100644 dev-libs/log4cxx/files/digest-log4cxx-0.9.5 rename dev-libs/log4cxx/files/{digest-log4cxx-0.9.7-r2 => digest-log4cxx-0.9.7-r4} (100%) delete mode 100644 dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff create mode 100644 dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch delete mode 100644 dev-libs/log4cxx/log4cxx-0.9.5.ebuild rename dev-libs/log4cxx/{log4cxx-0.9.7-r2.ebuild => log4cxx-0.9.7-r4.ebuild} (50%) diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog index 12a8d8dfecf9..b664e3c04fed 100644 --- a/dev-libs/log4cxx/ChangeLog +++ b/dev-libs/log4cxx/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/log4cxx # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.20 2007/02/22 01:05:20 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.21 2007/03/15 22:48:29 dev-zero Exp $ + +*log4cxx-0.9.7-r4 (15 Mar 2007) + + 15 Mar 2007; Tiziano Müller + -files/log4cxx-0.9.5-fix-errno.diff, +files/log4cxx-0.9.7-tchar.patch, + -log4cxx-0.9.5.ebuild, -log4cxx-0.9.7-r2.ebuild, +log4cxx-0.9.7-r4.ebuild: + Added patch to fix compilation problems for projects depending on log4cxx + (bug #162523, thanks to Pedro). Dropped old versions. 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest index 2342fa9cda38..6f0ef67fb87a 100644 --- a/dev-libs/log4cxx/Manifest +++ b/dev-libs/log4cxx/Manifest @@ -1,7 +1,6 @@ -AUX log4cxx-0.9.5-fix-errno.diff 683 RMD160 184a781698f1ac7743b7ddb0b450c6c0bf4f78ee SHA1 11e5867c47d8f777be2863f7adf08439b9b8af0a SHA256 c0301339ae078ed7c8b8a945556346421b28d5d4f19d77ffb7f1014d9985943e -MD5 f9e8c2a552b387262cde2f04b5dc9605 files/log4cxx-0.9.5-fix-errno.diff 683 -RMD160 184a781698f1ac7743b7ddb0b450c6c0bf4f78ee files/log4cxx-0.9.5-fix-errno.diff 683 -SHA256 c0301339ae078ed7c8b8a945556346421b28d5d4f19d77ffb7f1014d9985943e files/log4cxx-0.9.5-fix-errno.diff 683 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX log4cxx-0.9.7-gcc41.patch 523 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e SHA1 7f55bf31bb2225cbdd43ca41be47b921c2d795b6 SHA256 de55161e96e70a48eb0408d3096c831bf30d7985bb19e2f285389476035c9ec4 MD5 cffaee6c7b2319f836c036461d488568 files/log4cxx-0.9.7-gcc41.patch 523 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e files/log4cxx-0.9.7-gcc41.patch 523 @@ -10,38 +9,41 @@ AUX log4cxx-0.9.7-gentoo.diff 1989 RMD160 9f4cc34f71119b8e318db5315cf2807d6ef1c7 MD5 f1b5b29185d699bc52fd6f9d23af3588 files/log4cxx-0.9.7-gentoo.diff 1989 RMD160 9f4cc34f71119b8e318db5315cf2807d6ef1c788 files/log4cxx-0.9.7-gentoo.diff 1989 SHA256 ed1e5ec3192f61ff6731816ea45dee35e2d257b4d3f01b7e2fcf6e64febc0807 files/log4cxx-0.9.7-gentoo.diff 1989 +AUX log4cxx-0.9.7-tchar.patch 350 RMD160 aa4d404e36fe3765fc020c7bc5538458d846622c SHA1 a5cf4faefadc06b5f7560d1ea9aba2606fff085a SHA256 654b9c7e1d10d8d3ce7396ceb7588b270a73643aa81890748b6da18fc6409397 +MD5 76d8a1eaa505e617464b26544514b3e2 files/log4cxx-0.9.7-tchar.patch 350 +RMD160 aa4d404e36fe3765fc020c7bc5538458d846622c files/log4cxx-0.9.7-tchar.patch 350 +SHA256 654b9c7e1d10d8d3ce7396ceb7588b270a73643aa81890748b6da18fc6409397 files/log4cxx-0.9.7-tchar.patch 350 AUX log4cxx-0.9.7-use-SQLWCHAR.diff 967 RMD160 a2972e6c6b4c840f14082a0ef8d29d6bf03ab961 SHA1 2f340f656e33b297cdd205d69e8fb60e397b978e SHA256 4831659f137cdbb9c188d64f00c4b20d69082044d3705d8c6409ea5ab218b212 MD5 b11a3e797b67c6aea1bb82f6473890df files/log4cxx-0.9.7-use-SQLWCHAR.diff 967 RMD160 a2972e6c6b4c840f14082a0ef8d29d6bf03ab961 files/log4cxx-0.9.7-use-SQLWCHAR.diff 967 SHA256 4831659f137cdbb9c188d64f00c4b20d69082044d3705d8c6409ea5ab218b212 files/log4cxx-0.9.7-use-SQLWCHAR.diff 967 -DIST log4cxx-0.9.5.tar.gz 232685 RMD160 8c41aa584be1c019c71a8be8a14624cbc149409a SHA1 a72219bedab25e217f17f89eea1fab757c8d474a SHA256 8485ec4423e24641334df3cf45e8cb5bf55fe05d3423ecb83991f404432c2db5 DIST log4cxx-0.9.7.tar.gz 256449 RMD160 e8bcb2b188615b4edb09b807cb763535432586e7 SHA1 a1e156f24530fea72fb2c4b11ae137eddda6fd5a SHA256 5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6 -EBUILD log4cxx-0.9.5.ebuild 881 RMD160 cd6ca033b5d1c3c3adf174b1c314ac654ce393b5 SHA1 c5ad8cf21a790adf732660b9c178f05484fbc39a SHA256 ed41aaaf6787fd3c518c28aa674a8328e8e0d20301f92e17c9e9d9f03d462bc2 -MD5 acdf5c918d02c97d984332414891678e log4cxx-0.9.5.ebuild 881 -RMD160 cd6ca033b5d1c3c3adf174b1c314ac654ce393b5 log4cxx-0.9.5.ebuild 881 -SHA256 ed41aaaf6787fd3c518c28aa674a8328e8e0d20301f92e17c9e9d9f03d462bc2 log4cxx-0.9.5.ebuild 881 -EBUILD log4cxx-0.9.7-r2.ebuild 1852 RMD160 b0b930b8833be3fe79a01ceaaea3623441c09138 SHA1 8789c559d7b8eba33bc51a62decbb73188a58d4f SHA256 772cf8903db20ef4460280fc8ce63639f8482d691dced75a19e5218ae73fe72f -MD5 8211362a19f81bd9b197fe9ba86a1dfa log4cxx-0.9.7-r2.ebuild 1852 -RMD160 b0b930b8833be3fe79a01ceaaea3623441c09138 log4cxx-0.9.7-r2.ebuild 1852 -SHA256 772cf8903db20ef4460280fc8ce63639f8482d691dced75a19e5218ae73fe72f log4cxx-0.9.7-r2.ebuild 1852 -EBUILD log4cxx-0.9.7-r3.ebuild 2319 RMD160 e38267368e3d1fee9928340ee78d9258e8a6a6ff SHA1 80ec728e3035d1a674fde6d5e260fb9838efab43 SHA256 cbace987d143bc2e7efae597b107658c21950f4e19ecd3c00aaa2bbbe6f8e8cf -MD5 db120fa6ab22c3fa647d9f390724466d log4cxx-0.9.7-r3.ebuild 2319 -RMD160 e38267368e3d1fee9928340ee78d9258e8a6a6ff log4cxx-0.9.7-r3.ebuild 2319 -SHA256 cbace987d143bc2e7efae597b107658c21950f4e19ecd3c00aaa2bbbe6f8e8cf log4cxx-0.9.7-r3.ebuild 2319 -MISC ChangeLog 3039 RMD160 0934271089567dd260e3e55269bc7880e3ba2a0a SHA1 d092acaad88a4812d9fda89b08fc6eabd9c642d7 SHA256 c295d1a7adf110c0c57769073c8a5ba08047d2b1358c2bc2014bac8cb5f7ecf6 -MD5 7d52a63b33dda51dd08b72b218ca8874 ChangeLog 3039 -RMD160 0934271089567dd260e3e55269bc7880e3ba2a0a ChangeLog 3039 -SHA256 c295d1a7adf110c0c57769073c8a5ba08047d2b1358c2bc2014bac8cb5f7ecf6 ChangeLog 3039 +EBUILD log4cxx-0.9.7-r3.ebuild 2322 RMD160 6128a52efece89499623525c92267819d26bff51 SHA1 22bb25caa86ea5b33eda816187468e4d5fc8febc SHA256 2e527380c60ae48f9157f8db4787c6bec496957edab53f21d9dfa34ba3d61614 +MD5 2a932779629c83c929fd236a42bf8a78 log4cxx-0.9.7-r3.ebuild 2322 +RMD160 6128a52efece89499623525c92267819d26bff51 log4cxx-0.9.7-r3.ebuild 2322 +SHA256 2e527380c60ae48f9157f8db4787c6bec496957edab53f21d9dfa34ba3d61614 log4cxx-0.9.7-r3.ebuild 2322 +EBUILD log4cxx-0.9.7-r4.ebuild 2361 RMD160 c77b5e3dee92fbb0f366a982cb31c79b39f97202 SHA1 6e4b78d9d51244bafeb80166433d329aa1be8444 SHA256 58fe4e1866bb0d2eb433bb5cd833a2ffbee5eada3738a69e708090e0e3f724ba +MD5 7b16ced22e1d156745bdc8be145fc7b8 log4cxx-0.9.7-r4.ebuild 2361 +RMD160 c77b5e3dee92fbb0f366a982cb31c79b39f97202 log4cxx-0.9.7-r4.ebuild 2361 +SHA256 58fe4e1866bb0d2eb433bb5cd833a2ffbee5eada3738a69e708090e0e3f724ba log4cxx-0.9.7-r4.ebuild 2361 +MISC ChangeLog 3411 RMD160 9502fbc1fc06103c8ebda58b489a9a81d1a55f34 SHA1 b45039e7de9ad01b61910b3317aff7ea5594e445 SHA256 9fc057cce2b0f1a5d191dc7aedda1e7850ed014f3a0cd1f77563ac8fc45fbedc +MD5 dcfd8a8244dee921ae2a91023efe2d9e ChangeLog 3411 +RMD160 9502fbc1fc06103c8ebda58b489a9a81d1a55f34 ChangeLog 3411 +SHA256 9fc057cce2b0f1a5d191dc7aedda1e7850ed014f3a0cd1f77563ac8fc45fbedc ChangeLog 3411 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c metadata.xml 157 SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f metadata.xml 157 -MD5 980b37321a69672b64fd03d921bc2d2e files/digest-log4cxx-0.9.5 241 -RMD160 3a7329c0356122bfc39428aa3a1c6453593fd6d4 files/digest-log4cxx-0.9.5 241 -SHA256 a6947cf7afad621d2914f8cf7feeaa650dda7e297e11ef3e4980aaad36888ecf files/digest-log4cxx-0.9.5 241 -MD5 b1a6f35db3f3a221b7e25eec70528d62 files/digest-log4cxx-0.9.7-r2 241 -RMD160 001203f955281bb98db260bc181d31d48b56806d files/digest-log4cxx-0.9.7-r2 241 -SHA256 a8e1d5d020ae8322758615db044ea3ece82f9ac64e23fc878689d71d7794bf7f files/digest-log4cxx-0.9.7-r2 241 MD5 b1a6f35db3f3a221b7e25eec70528d62 files/digest-log4cxx-0.9.7-r3 241 RMD160 001203f955281bb98db260bc181d31d48b56806d files/digest-log4cxx-0.9.7-r3 241 SHA256 a8e1d5d020ae8322758615db044ea3ece82f9ac64e23fc878689d71d7794bf7f files/digest-log4cxx-0.9.7-r3 241 +MD5 b1a6f35db3f3a221b7e25eec70528d62 files/digest-log4cxx-0.9.7-r4 241 +RMD160 001203f955281bb98db260bc181d31d48b56806d files/digest-log4cxx-0.9.7-r4 241 +SHA256 a8e1d5d020ae8322758615db044ea3ece82f9ac64e23fc878689d71d7794bf7f files/digest-log4cxx-0.9.7-r4 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF+c1MGwVqY66cHjARAkivAJ495G2fsK7AFSimvjZTShCB6eIRxACeMs// +Gsj9abDKLc0e27XZnK4pVs4= +=Pnmm +-----END PGP SIGNATURE----- diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.5 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.5 deleted file mode 100644 index 6e042c691004..000000000000 --- a/dev-libs/log4cxx/files/digest-log4cxx-0.9.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 dd1cc7a974d27620a7f2a1e886bf1757 log4cxx-0.9.5.tar.gz 232685 -RMD160 8c41aa584be1c019c71a8be8a14624cbc149409a log4cxx-0.9.5.tar.gz 232685 -SHA256 8485ec4423e24641334df3cf45e8cb5bf55fe05d3423ecb83991f404432c2db5 log4cxx-0.9.5.tar.gz 232685 diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r4 similarity index 100% rename from dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 rename to dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r4 diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff b/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff deleted file mode 100644 index d157ae369747..000000000000 --- a/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- src/filewatchdog.cpp.orig 2004-08-07 21:36:34.987676584 -0500 -+++ src/filewatchdog.cpp 2004-08-07 21:36:41.562677032 -0500 -@@ -17,10 +17,7 @@ - #include - #include - #include -- --#ifdef WIN32 --#include -+#include --#endif - - using namespace log4cxx; - using namespace log4cxx::helpers; ---- src/socketimpl.cpp.orig 2004-08-07 22:01:02.577569008 -0500 -+++ src/socketimpl.cpp 2004-08-07 22:01:23.868332320 -0500 -@@ -15,6 +15,7 @@ - ***************************************************************************/ - - #include -+#include - - #ifdef WIN32 - #include diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch new file mode 100644 index 000000000000..a3ba40fc864a --- /dev/null +++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch @@ -0,0 +1,12 @@ +--- log4cxx-0.9.7.orig/include/log4cxx/helpers/tchar.h 2004-05-10 14:54:50.000000000 +0200 ++++ log4cxx-0.9.7/include/log4cxx/helpers/tchar.h 2007-01-17 12:46:44.000000000 +0100 +@@ -142,7 +142,9 @@ + #define _T(x) x + #endif + ++#ifndef TCHAR + typedef char TCHAR; ++#endif + #define totupper toupper + #define totlower tolower + #define tcout std::cout diff --git a/dev-libs/log4cxx/log4cxx-0.9.5.ebuild b/dev-libs/log4cxx/log4cxx-0.9.5.ebuild deleted file mode 100644 index 419fb4fa1c21..000000000000 --- a/dev-libs/log4cxx/log4cxx-0.9.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.5.ebuild,v 1.7 2005/01/12 12:06:08 ka0ttic Exp $ - -inherit eutils - -DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations" -HOMEPAGE="http://log4cxx.sourceforge.net/" -SRC_URI="mirror://sourceforge/log4cxx/${P}.tar.gz" - -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND="virtual/libc - dev-libs/libxml2" -RDEPEND="" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-fix-errno.diff -} - -src_compile() { - ./autogen.sh || die "autogen.sh failed" - econf || die "econf failed" - emake -j1 || die "emake failed" -} - -src_install () { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO -} diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild index 9418f6afe5f5..3c88328a12b2 100644 --- a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild +++ b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild,v 1.3 2006/10/28 08:06:39 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild,v 1.4 2007/03/15 22:48:29 dev-zero Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild similarity index 50% rename from dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild rename to dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild index 3e41d08784fb..97010ced943d 100644 --- a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild +++ b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild @@ -1,49 +1,71 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild,v 1.3 2005/06/28 08:24:37 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild,v 1.1 2007/03/15 22:48:29 dev-zero Exp $ -inherit eutils flag-o-matic +WANT_AUTOCONF="2.5" +WANT_AUTOMAKE="latest" + +inherit autotools eutils flag-o-matic + +KEYWORDS="~amd64 ~x86" DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="http://logging.apache.org/log4cxx/" SRC_URI="http://www.apache.org/dist/logging/${PN}/${P}.tar.gz" - LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="doc unicode odbc smtp" +IUSE="doc iodbc unicode odbc smtp threads" -DEPEND="virtual/libc +RDEPEND="dev-libs/boost dev-libs/libxml2 - doc? ( app-doc/doxygen media-gfx/graphviz ) - odbc? ( dev-db/unixODBC ) + odbc? ( + iodbc? ( >=dev-db/libiodbc-3.52.4 ) + !iodbc? ( dev-db/unixODBC ) ) smtp? ( dev-libs/libsmtp )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen media-gfx/graphviz )" + +pkg_setup() { + if use iodbc && ! use odbc ; then + elog "Please enable the odbc USE-flag as well if you want odbc-support through iodbc." + fi +} src_unpack() { unpack ${A} - cd ${S} - sed -i "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \ + cd "${S}" + sed -i \ + -e "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \ docs/Makefile.am || die "sed failed" - epatch ${FILESDIR}/${P}-gentoo.diff + epatch "${FILESDIR}/${P}-gentoo.diff" if use unicode && use odbc ; then - epatch ${FILESDIR}/${P}-use-SQLWCHAR.diff + epatch "${FILESDIR}/${P}-use-SQLWCHAR.diff" fi + + epatch "${FILESDIR}/${P}-gcc41.patch" + epatch "${FILESDIR}/${P}-tchar.patch" + eautoreconf } src_compile() { - ${S}/autogen.sh || die "autogen.sh failed" - # has cppunit support, but make check builds nothing... local myconf="--disable-cppunit" use doc && myconf="${myconf} --enable-doxygen --enable-dot - --enable-html-docs --enable-latex-docs" || \ + --enable-html-docs" || \ myconf="${myconf} --disable-doxygen --disable-dot --disable-html-docs" use smtp && myconf="${myconf} --with-SMTP=libsmtp" - use odbc && myconf="${myconf} --with-ODBC=unixODBC" + if use odbc ; then + if use iodbc ; then + myconf="${myconf} --with-ODBC=iODBC" + else + myconf="${myconf} --with-ODBC=unixODBC" + fi + fi # it's broken, so we must do this rather than use_enable use unicode && myconf="${myconf} --enable-unicode" + use threads && myconf="${myconf} --with-thread=pthread" if use unicode && use odbc ; then # fix some warnings as w/o it TCHAR gets typedef'd to signed short @@ -51,11 +73,13 @@ src_compile() { append-flags -DSQL_WCHART_CONVERT fi - econf ${myconf} || die "econf failed" + econf \ + --with-XML=libxml2 \ + ${myconf} || die "econf failed" emake -j1 || die "emake failed" } src_install () { - make DESTDIR=${D} install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS ChangeLog README } -- 2.26.2