summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/poco/ChangeLog7
-rw-r--r--dev-libs/poco/poco-1.3.6_p2.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index 5e332a9e3e02..f642dedbc40e 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,11 @@
# 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.10 2010/08/01 11:14:43 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.11 2010/08/23 18:39:00 dev-zero Exp $
+
+ 23 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> poco-1.3.6_p2.ebuild:
+ Changed order of -O2 replacement in sed call to avoid stripping an -O2 in
+ our CFLAGS or (even worse) in LDFLAGS, resulting in unoptimized libs or a
+ 'file not found error' linker error.
01 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
files/1.3.6_p2-gentoo.patch:
diff --git a/dev-libs/poco/poco-1.3.6_p2.ebuild b/dev-libs/poco/poco-1.3.6_p2.ebuild
index 4546741380da..f79d16d5be16 100644
--- a/dev-libs/poco/poco-1.3.6_p2.ebuild
+++ b/dev-libs/poco/poco-1.3.6_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.6_p2.ebuild,v 1.1 2010/07/20 00:12:44 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.6_p2.ebuild,v 1.2 2010/08/23 18:39:00 dev-zero Exp $
EAPI="2"
@@ -80,6 +80,7 @@ src_configure() {
|| die "configure failed"
sed -i \
+ -e 's|-O2||g' \
-e "s|CC = .*|CC = $(tc-getCC)|" \
-e "s|CXX = .*|CXX = $(tc-getCXX)|" \
-e "s|RANLIB = .*|RANLIB = $(tc-getRANLIB)|" \
@@ -89,7 +90,6 @@ src_configure() {
-e "s|CXXFLAGS = |CXXFLAGS = ${CXXFLAGS} |" \
-e "s|LINKFLAGS =|LINKFLAGS = ${LDFLAGS} |" \
-e "s|SHAREDOPT_LINK = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK =|" \
- -e 's|-O2||g' \
build/config/Linux build/config/FreeBSD || die "sed failed"
sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
}