summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-06-17 02:33:13 +0000
committerMike Frysinger <vapier@gentoo.org>2013-06-17 02:33:13 +0000
commita813521746051ce560e6a131672925ecb10b8eed (patch)
treedf67da110920d762db6c374636f8381d78b42b5f /sys-libs/zlib
parentFix python targets as flask was downrated (diff)
downloadgentoo-2-a813521746051ce560e6a131672925ecb10b8eed.tar.gz
gentoo-2-a813521746051ce560e6a131672925ecb10b8eed.tar.bz2
gentoo-2-a813521746051ce560e6a131672925ecb10b8eed.zip
Fix transposed emake #473370 by Michał Górny.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-libs/zlib')
-rw-r--r--sys-libs/zlib/ChangeLog5
-rw-r--r--sys-libs/zlib/zlib-1.2.8.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index b3828aac3d27..33598f1f80af 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/zlib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.122 2013/06/05 00:41:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.123 2013/06/17 02:33:13 vapier Exp $
+
+ 17 Jun 2013; Mike Frysinger <vapier@gentoo.org> zlib-1.2.8.ebuild:
+ Fix transposed emake #473370 by Michał Górny.
05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/sys-libs/zlib/zlib-1.2.8.ebuild b/sys-libs/zlib/zlib-1.2.8.ebuild
index 8614c90aed6d..038bb04cffad 100644
--- a/sys-libs/zlib/zlib-1.2.8.ebuild
+++ b/sys-libs/zlib/zlib-1.2.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8.ebuild,v 1.1 2013/05/04 03:52:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8.ebuild,v 1.2 2013/06/17 02:33:13 vapier Exp $
AUTOTOOLS_AUTO_DEPEND="no"
inherit autotools toolchain-funcs multilib
@@ -42,7 +42,6 @@ src_compile() {
-e 's|@includedir@|${prefix}/include|g' \
-e 's|@VERSION@|'${PV}'|g' \
zlib.pc.in > zlib.pc || die
- emake || die
;;
*) # not an autoconf script, so can't use econf
local uname=$(/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
@@ -52,6 +51,7 @@ src_compile() {
--libdir=/usr/$(get_libdir) \
${uname:+--uname=${uname}} \
|| die
+ emake || die
;;
esac
if use minizip ; then