From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LnWPp-0004J5-IO for garchives@archives.gentoo.org; Sat, 28 Mar 2009 11:09:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5EC5E0319; Sat, 28 Mar 2009 11:09:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 93654E0319 for ; Sat, 28 Mar 2009 11:09:28 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 4224964DB8 for ; Sat, 28 Mar 2009 11:09:28 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LnWPn-0000Sj-MS for gentoo-commits@lists.gentoo.org; Sat, 28 Mar 2009 11:09:27 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: toolchain-funcs.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain-funcs.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Sat, 28 Mar 2009 11:09:27 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a9fa6fde-f542-46a8-b31a-3cf7ba51b526 X-Archives-Hash: d637fc0ede0bda611cca6389bcf6e79b vapier 09/03/28 11:09:27 Modified: toolchain-funcs.eclass Log: support funk SONAMEs like libfoo.so -> libfoo-0.1.so Revision Changes Path 1.88 eclass/toolchain-funcs.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-f= uncs.eclass?rev=3D1.88&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-f= uncs.eclass?rev=3D1.88&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-f= uncs.eclass?r1=3D1.87&r2=3D1.88 Index: toolchain-funcs.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- toolchain-funcs.eclass 1 Mar 2009 08:09:44 -0000 1.87 +++ toolchain-funcs.eclass 28 Mar 2009 11:09:27 -0000 1.88 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.87 = 2009/03/01 08:09:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.88 = 2009/03/28 11:09:27 vapier Exp $ =20 # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -426,8 +426,12 @@ local tlib if ${auto} ; then lib=3D"lib${lib}${suffix}" + tlib=3D$(scanelf -qF'%S#F' "${D}"/usr/${libdir}/${lib}) mv "${D}"/usr/${libdir}/${lib}* "${D}"/${libdir}/ || die - tlib=3D$(scanelf -qF'%S#F' "${D}"/${libdir}/${lib}) + # some SONAMEs are funky: they encode a version before the .so + if [[ ${tlib} !=3D ${lib}* ]] ; then + mv "${D}"/usr/${libdir}/${tlib}* "${D}"/${libdir}/ || die + fi [[ -z ${tlib} ]] && die "unable to read SONAME from ${lib}" rm -f "${D}"/${libdir}/${lib} else