From 5b23b7be80b96bca2a8da7b624622115a83c76b8 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 10 Jan 2012 11:33:50 +0000 Subject: Fix installation with USE=client on 64-bits Solaris targets (Portage version: 2.2.01.20048-prefix/cvs/SunOS i386) --- sys-devel/gdb/ChangeLog | 5 ++++- sys-devel/gdb/gdb-7.3.1-r1.ebuild | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'sys-devel') diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog index 113055319816..3bebca959764 100644 --- a/sys-devel/gdb/ChangeLog +++ b/sys-devel/gdb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gdb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.203 2012/01/06 11:30:07 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.204 2012/01/10 11:33:50 grobian Exp $ + + 10 Jan 2012; Fabian Groffen gdb-7.3.1-r1.ebuild: + Fix installation with USE=client on 64-bits Solaris targets 06 Jan 2012; Fabian Groffen gdb-7.3.1-r1.ebuild: Marked ~x64-freebsd diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild index f29a7e3d9d21..7e98e87baa75 100644 --- a/sys-devel/gdb/gdb-7.3.1-r1.ebuild +++ b/sys-devel/gdb/gdb-7.3.1-r1.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-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.4 2012/01/06 11:30:07 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.5 2012/01/10 11:33:50 grobian Exp $ EAPI="3" @@ -132,7 +132,17 @@ src_test() { src_install() { use server && ! use client && cd gdb/gdbserver emake DESTDIR="${D}" install || die - use client && { rm "${ED}"/usr/lib*/libiberty.a || die ; } + if use client; then + case ${CHOST} in + x86_64-*-solaris*|sparcv9-*-solaris*) + # usr/lib/64 -> usr/lib/{sparcv9,amd64} (no usr/lib64!) + rm "${ED}"/usr/lib/*/libiberty.a || die + ;; + *) + rm "${ED}"/usr/lib*/libiberty.a || die + ;; + esac + fi cd "${S}" # Don't install docs when building a cross-gdb -- cgit v1.2.3-65-gdbad