summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-11-25 07:19:51 +0000
committerPacho Ramos <pacho@gentoo.org>2012-11-25 07:19:51 +0000
commit0fd50b269b721a73dcf28c27aa6b99be3f276ce0 (patch)
tree25fc2c78b7a72ecd745c2c60bf07b43042224135 /eclass/emul-linux-x86.eclass
parentVersion bump. Add myself as maintainer. (diff)
downloadgentoo-2-0fd50b269b721a73dcf28c27aa6b99be3f276ce0.tar.gz
gentoo-2-0fd50b269b721a73dcf28c27aa6b99be3f276ce0.tar.bz2
gentoo-2-0fd50b269b721a73dcf28c27aa6b99be3f276ce0.zip
Really install only libs, not everything included in .so* (#442910 by SpanKY, Samuli Suominen and Jim Faulkner).
Diffstat (limited to 'eclass/emul-linux-x86.eclass')
-rw-r--r--eclass/emul-linux-x86.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass
index cbb741b7deb5..91a02380d9f1 100644
--- a/eclass/emul-linux-x86.eclass
+++ b/eclass/emul-linux-x86.eclass
@@ -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/eclass/emul-linux-x86.eclass,v 1.14 2012/11/02 16:38:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.15 2012/11/25 07:19:51 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -59,7 +59,7 @@ emul-linux-x86_src_unpack() {
emul-linux-x86_src_prepare() {
ALLOWED=${ALLOWED:-^${S}/etc/env.d}
has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
- find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
+ find "${S}" ! -type d ! '(' -name '*.so' -o -name '*.so.[0-9]*' ')' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
}
emul-linux-x86_src_install() {