summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-07-12 19:59:33 +0000
committerFabian Groffen <grobian@gentoo.org>2013-07-12 19:59:33 +0000
commit130cdfb83e0608b4f32081d66898ff5890696740 (patch)
treeda9f2ea8850322caad92fdd4a38f70b7a7efc76a /app-arch/libarchive
parentVersion bump. Remove old ebuilds. Bug #475898 (diff)
downloadgentoo-2-130cdfb83e0608b4f32081d66898ff5890696740.tar.gz
gentoo-2-130cdfb83e0608b4f32081d66898ff5890696740.tar.bz2
gentoo-2-130cdfb83e0608b4f32081d66898ff5890696740.zip
Don't request shared libraries on static-only systems such as FreeMiNT, bug #458500
(Portage version: 2.2.01.22124-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'app-arch/libarchive')
-rw-r--r--app-arch/libarchive/ChangeLog6
-rw-r--r--app-arch/libarchive/libarchive-3.1.2-r1.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog
index a55e8f4066ad..97542ecd8249 100644
--- a/app-arch/libarchive/ChangeLog
+++ b/app-arch/libarchive/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/libarchive
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.156 2013/06/16 09:42:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.157 2013/07/12 19:59:33 grobian Exp $
+
+ 12 Jul 2013; Fabian Groffen <grobian@gentoo.org> libarchive-3.1.2-r1.ebuild:
+ Don't request shared libraries on static-only systems such as FreeMiNT, bug
+ #458500
16 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Cleanup due #122207
diff --git a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild
index 58a4494db30a..5d00138f4689 100644
--- a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.1.2-r1.ebuild,v 1.12 2013/04/05 18:11:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-3.1.2-r1.ebuild,v 1.13 2013/07/12 19:59:33 grobian Exp $
EAPI=5
-inherit eutils libtool multilib
+inherit eutils libtool multilib toolchain-funcs
DESCRIPTION="BSD tar command"
HOMEPAGE="http://www.libarchive.org/"
@@ -47,8 +47,8 @@ src_configure() {
# and not liblzmadec with this version.
econf \
$(use_enable static-libs static) \
- --enable-bsdtar=shared \
- --enable-bsdcpio=shared \
+ --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \
+ --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \
$(use_enable xattr) \
$(use_enable acl) \
$(use_with zlib) \