summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-18 23:27:03 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-18 23:27:03 +0000
commit2ed4fd5af753076dc29a28d46d661d17aef6e663 (patch)
treeba1e8521131d69bd8a0f4b8e262cce131e12a617 /sys-libs
parentDisable --foreground in init.d script for older versions #431886 by Nick Bowler. (diff)
downloadgentoo-2-2ed4fd5af753076dc29a28d46d661d17aef6e663.tar.gz
gentoo-2-2ed4fd5af753076dc29a28d46d661d17aef6e663.tar.bz2
gentoo-2-2ed4fd5af753076dc29a28d46d661d17aef6e663.zip
Extract host os field via config.sub #347167 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/zlib/ChangeLog5
-rw-r--r--sys-libs/zlib/zlib-1.2.7.ebuild10
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index af2c76bfa903..6c095d06f986 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/zlib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.111 2012/08/18 04:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.112 2012/08/18 23:27:03 vapier Exp $
+
+ 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> zlib-1.2.7.ebuild:
+ Extract host os field via config.sub #347167 by Diego Elio Pettenò.
18 Aug 2012; Mike Frysinger <vapier@gentoo.org> zlib-1.2.7.ebuild:
Remove libz/libminizip static files by name to avoid deleting files for
diff --git a/sys-libs/zlib/zlib-1.2.7.ebuild b/sys-libs/zlib/zlib-1.2.7.ebuild
index b056e9aa7970..0fdce93e29d1 100644
--- a/sys-libs/zlib/zlib-1.2.7.ebuild
+++ b/sys-libs/zlib/zlib-1.2.7.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/sys-libs/zlib/zlib-1.2.7.ebuild,v 1.3 2012/08/18 04:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.7.ebuild,v 1.4 2012/08/18 23:27:03 vapier Exp $
AUTOTOOLS_AUTO_DEPEND="no"
inherit autotools toolchain-funcs
@@ -44,7 +44,13 @@ src_compile() {
zlib.pc.in > zlib.pc || die
;;
*) # not an autoconf script, so can't use econf
- echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
+ local uname=$(/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
+ echoit ./configure \
+ --shared \
+ --prefix=/usr \
+ --libdir=/usr/$(get_libdir) \
+ ${uname:+--uname=${uname}} \
+ || die
emake || die
;;
esac