From 8f6f00a0cf80ebe9c0542fb592878b4219cecd9d Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 5 Jan 2015 02:16:19 +0000 Subject: fix broken patch (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BDEED020) --- dev-libs/poco/ChangeLog | 5 ++++- dev-libs/poco/files/1.4.6_p4-gentoo.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'dev-libs/poco') diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog index fad6d23b667b..f6b0e1a5637b 100644 --- a/dev-libs/poco/ChangeLog +++ b/dev-libs/poco/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/poco # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.31 2015/01/02 13:47:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.32 2015/01/05 02:16:19 hasufell Exp $ + + 05 Jan 2015; Julian Ospald files/1.4.6_p4-gentoo.patch: + fix broken patch 02 Jan 2015; Agostino Sarubbo poco-1.4.6_p4.ebuild: Stable for x86, wrt bug #508720 diff --git a/dev-libs/poco/files/1.4.6_p4-gentoo.patch b/dev-libs/poco/files/1.4.6_p4-gentoo.patch index bc967cc5e57d..8cfc9237db01 100644 --- a/dev-libs/poco/files/1.4.6_p4-gentoo.patch +++ b/dev-libs/poco/files/1.4.6_p4-gentoo.patch @@ -34,7 +34,7 @@ # -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++ CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) -+else ifeq (unixodbc, $(GENTOO_ODBC) ++else ifeq (unixodbc, $(GENTOO_ODBC)) SYSLIBS += -lodbc COMMONFLAGS += -DPOCO_UNIXODBC -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) -- cgit v1.2.3-65-gdbad