summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-09 14:43:20 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-09 14:43:20 +0000
commite90608d00a76033c892e857191c5a366e027214b (patch)
tree1d1a8cfcdfb1d4a5db9b6b3668660c403ec91ea1 /app-arch/p7zip
parentremove old (diff)
downloadgentoo-2-e90608d00a76033c892e857191c5a366e027214b.tar.gz
gentoo-2-e90608d00a76033c892e857191c5a366e027214b.tar.bz2
gentoo-2-e90608d00a76033c892e857191c5a366e027214b.zip
app-arch/p7zip: Drop -O -pipe from buildsystem, add -- to emake so that -l doesn't get confused by 7z* make targets, #420393
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/p7zip')
-rw-r--r--app-arch/p7zip/ChangeLog9
-rw-r--r--app-arch/p7zip/p7zip-9.20.1-r3.ebuild (renamed from app-arch/p7zip/p7zip-9.20.1-r2.ebuild)8
2 files changed, 13 insertions, 4 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 3c4c39b7f744..7ba337d91ffb 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-arch/p7zip
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.146 2012/06/07 16:29:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.147 2012/06/09 14:43:20 jlec Exp $
+
+*p7zip-9.20.1-r3 (09 Jun 2012)
+
+ 09 Jun 2012; Justin Lecher <jlec@gentoo.org> -p7zip-9.20.1-r2.ebuild,
+ +p7zip-9.20.1-r3.ebuild:
+ Drop -O -pipe from buildsystem, add -- to emake so that -l doesn't get
+ confused by 7z* make targets, #420393
07 Jun 2012; Julian Ospald <hasufell@gentoo.org> p7zip-9.13.ebuild,
p7zip-9.13-r3.ebuild, +files/p7zip-9.13-QA.patch, -p7zip-9.20.1.ebuild,
diff --git a/app-arch/p7zip/p7zip-9.20.1-r2.ebuild b/app-arch/p7zip/p7zip-9.20.1-r3.ebuild
index 146e19f4af87..be7ac3348572 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r2.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r2.ebuild,v 1.2 2012/06/07 16:29:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r3.ebuild,v 1.1 2012/06/09 14:43:20 jlec Exp $
EAPI=4
@@ -44,6 +44,8 @@ src_prepare() {
sed \
-e 's:-m32 ::g' \
-e 's:-m64 ::g' \
+ -e 's:-O::g' \
+ -e 's:-pipe::g' \
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
-i makefile* || die
@@ -95,8 +97,8 @@ src_prepare() {
src_compile() {
emake all3
if use kde || use wxwidgets; then
- emake 7zG
- emake 7zFM
+ emake -- 7zG
+ emake -- 7zFM
fi
}