summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-08-01 11:14:43 +0000
committerThomas Sachau <tommy@gentoo.org>2010-08-01 11:14:43 +0000
commit6822fb0f538c418010eba4bf17b80ff09ec0d975 (patch)
tree001ebf6fe25d104b2e7007d9d11374022b6c8aec /dev-libs/poco
parentx86 stable, bug 324077 (diff)
downloadgentoo-2-6822fb0f538c418010eba4bf17b80ff09ec0d975.tar.gz
gentoo-2-6822fb0f538c418010eba4bf17b80ff09ec0d975.tar.bz2
gentoo-2-6822fb0f538c418010eba4bf17b80ff09ec0d975.zip
Update the gentoo patch, fixes bug 330493
(Portage version: 2.2_rc67-r8/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/poco')
-rw-r--r--dev-libs/poco/ChangeLog6
-rw-r--r--dev-libs/poco/files/1.3.6_p2-gentoo.patch4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index 996ea08c26a4..5e332a9e3e02 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/poco
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.9 2010/07/20 00:12:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.10 2010/08/01 11:14:43 tommy Exp $
+
+ 01 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ files/1.3.6_p2-gentoo.patch:
+ Update the gentoo patch, fixes bug 330493
*poco-1.3.6_p2 (20 Jul 2010)
diff --git a/dev-libs/poco/files/1.3.6_p2-gentoo.patch b/dev-libs/poco/files/1.3.6_p2-gentoo.patch
index b0e2dbef86c2..ec466f8567c5 100644
--- a/dev-libs/poco/files/1.3.6_p2-gentoo.patch
+++ b/dev-libs/poco/files/1.3.6_p2-gentoo.patch
@@ -46,12 +46,12 @@ diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Ma
COMMONFLAGS += -DPOCO_UNIXODBC
else
-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
++ifeq (iodbc, $(GENTOO_ODBC))
SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC
else
-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
++ifeq (iodbc, $(GENTOO_ODBC))
SYSLIBS += -liodbc -liodbcinst
COMMONFLAGS += -DPOCO_IODBC
else