Fixed ./configire --with-ODBC invocation (bug 76532) in addition to the compilation failures that ensued.

5 files changed, 67 insertions, 14 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 19e9d5a4a262..5a1213e3437b 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/log4cxx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.8 2005/01/06 13:49:00 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.9 2005/01/07 11:16:58 ka0ttic Exp $
+
+  07 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/log4cxx-0.9.7-gentoo.diff, +files/log4cxx-0.9.7-use-SQLWCHAR.diff,
+  log4cxx-0.9.7-r1.ebuild:
+  Fixed ./configire --with-ODBC invocation (bug 76532) in addition to the
+  compilation failures that ensued.
 
   06 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/log4cxx-0.9.5-fix-errno.diff, log4cxx-0.9.5.ebuild:
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index b0ad86ab76ef..e38f75351e22 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7e2198b107ecdb4548fd3b76a3480d21 log4cxx-0.9.7-r1.ebuild 1559
+MD5 6ea5e30e15875911760f85ec13706d85 log4cxx-0.9.7-r1.ebuild 1848
 MD5 500df1ceb8e4f1a53a7dc4090ee9b397 log4cxx-0.9.5.ebuild 882
-MD5 46c451c046f1128aaefd2f1a0ba76d15 ChangeLog 1423
+MD5 2123ed4cdde0b2e11c08873ca6c785fa ChangeLog 1685
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 50fe13b5c404fa59faeaebe40f36b6be files/log4cxx-0.9.7-gentoo.diff 750
+MD5 58ee85872eea9711c59ddaeeb2f09568 files/log4cxx-0.9.7-gentoo.diff 1037
+MD5 b11a3e797b67c6aea1bb82f6473890df files/log4cxx-0.9.7-use-SQLWCHAR.diff 967
 MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7-r1 65
 MD5 f9e8c2a552b387262cde2f04b5dc9605 files/log4cxx-0.9.5-fix-errno.diff 683
 MD5 1135167eb4745c4a16791f44317ba88b files/digest-log4cxx-0.9.5 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB3UHXEZCkKN40op4RApxNAJ44Y7hGq2j5ud/zYK5ENzM4MPKIpgCguw5g
-aq6LYH2Y48qMrDRUR6VZST0=
-=ya1h
+iD8DBQFB3m/4EZCkKN40op4RApxIAKCj6Fpwd5fNACCOpspkF1xf2I0RlQCgi2dh
+LMqUZjXV3miQ0of4WS76kSs=
+=xYjb
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
index ada50c4f84cd..50ba4dd14aac 100644
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
@@ -1,6 +1,17 @@
+diff -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
+--- log4cxx-0.9.7.orig/src/msxml.cpp	2004-05-10 08:37:45.000000000 -0400
++++ log4cxx-0.9.7/src/msxml.cpp	2005-01-07 01:29:54.013941856 -0500
+@@ -289,4 +289,5 @@
+ 	}
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
++
 diff -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
---- log4cxx-0.9.7.orig/src/smtpappender.cpp	2004-12-22 09:26:21.000000000 -0500
-+++ log4cxx-0.9.7/src/smtpappender.cpp	2004-12-22 09:59:25.247244129 -0500
+--- log4cxx-0.9.7.orig/src/smtpappender.cpp	2004-05-10 08:38:01.000000000 -0400
++++ log4cxx-0.9.7/src/smtpappender.cpp	2005-01-07 01:29:33.730025480 -0500
 @@ -134,7 +134,7 @@
  	for (i = recipients.begin(); i != recipients.end(); i++)
  	{
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
new file mode 100644
index 000000000000..0456e57594a2
--- /dev/null
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
@@ -0,0 +1,25 @@
+diff -urN log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp log4cxx-0.9.7/src/odbcappender.cpp
+--- log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp	2005-01-07 01:30:56.466447632 -0500
++++ log4cxx-0.9.7/src/odbcappender.cpp	2005-01-07 01:31:29.045494864 -0500
+@@ -111,7 +111,7 @@
+ 		ret = SQLExecDirect(stmt, (SQLTCHAR *)sql.c_str(), SQL_NTS);
+ #else
+ 		USES_CONVERSION;
+-		ret = SQLExecDirect(stmt, (SQLCHAR *)T2A(sql.c_str()), SQL_NTS);
++		ret = SQLExecDirect(stmt, (SQLWCHAR *)T2A(sql.c_str()), SQL_NTS);
+ #endif
+ 		if (ret < 0)
+ 		{
+@@ -182,9 +182,9 @@
+ 		std::string user = T2A(databaseUser.c_str());
+ 		std::string password = T2A(databasePassword.c_str());
+ 		ret = SQLConnect(connection,
+-			(SQLCHAR *)URL.c_str(), SQL_NTS,
+-			(SQLCHAR *)user.c_str(), SQL_NTS,
+-			(SQLCHAR *)password.c_str(), SQL_NTS);
++			(SQLWCHAR *)URL.c_str(), SQL_NTS,
++			(SQLWCHAR *)user.c_str(), SQL_NTS,
++			(SQLWCHAR *)password.c_str(), SQL_NTS);
+ #endif
+ 		if (ret < 0)
+ 		{
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild
index d526eaa751c6..cd4416887344 100644
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.7-r1.ebuild,v 1.2 2005/01/06 13:49:00 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild,v 1.3 2005/01/07 11:16:58 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://logging.apache.org/log4cxx/"
@@ -24,7 +24,12 @@ src_unpack() {
 	cd ${S}
 	sed -i "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \
 		docs/Makefile.am || die "sed failed"
+
 	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	if use unicode && use odbc ; then
+		epatch ${FILESDIR}/${P}-use-SQLWCHAR.diff
+	fi
 }
 
 src_compile() {
@@ -36,12 +41,17 @@ src_compile() {
 		--enable-html-docs --enable-latex-docs" || \
 		myconf="${myconf} --disable-doxygen --disable-dot --disable-html-docs"
 	use smtp && myconf="${myconf} --with-SMTP=libsmtp"
+	use odbc && myconf="${myconf} --with-ODBC=unixODBC"
 	# it's broken, so we must do this rather than use_enable
 	use unicode && myconf="${myconf} --enable-unicode"
 
-	econf \
-		$(use_with odbc ODBC) \
-		${myconf} || die "econf failed"
+	if use unicode && use odbc ; then
+		# fix some warnings as w/o it TCHAR gets typedef'd to signed short
+		# instead of wchar_t
+		append-flags -DSQL_WCHART_CONVERT
+	fi
+
+	econf ${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }