diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2012-03-07 16:18:23 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-03-07 16:18:23 +0000 |
| commit | ab9d9a8379a864aa1bd4d2a6f7b7fde311c105c5 (patch) | |
| tree | 8c7c0d95fd91a878c080068e945f90d94caa79ab /dev-db/oracle-instantclient-basic | |
| parent | Stop inheriting deprecated qt4.eclass, it was unused anyway. (diff) | |
| download | gentoo-2-ab9d9a8379a864aa1bd4d2a6f7b7fde311c105c5.tar.gz gentoo-2-ab9d9a8379a864aa1bd4d2a6f7b7fde311c105c5.tar.bz2 gentoo-2-ab9d9a8379a864aa1bd4d2a6f7b7fde311c105c5.zip | |
must not set ABI for non-multilib-able archs at all
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/oracle-instantclient-basic')
| -rw-r--r-- | dev-db/oracle-instantclient-basic/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog index 5c2c65fe6ef4..61cbed8c7acc 100644 --- a/dev-db/oracle-instantclient-basic/ChangeLog +++ b/dev-db/oracle-instantclient-basic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/oracle-instantclient-basic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.46 2012/03/07 15:22:15 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.47 2012/03/07 16:18:23 haubi Exp $ + + 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> + oracle-instantclient-basic-11.2.0.3.ebuild: + must not set ABI for non-multilib-able archs at all 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> oracle-instantclient-basic-11.2.0.3.ebuild: diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild index 3f5cb2a21327..7340b7f65417 100644 --- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild +++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.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/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.3 2012/03/07 15:29:59 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.4 2012/03/07 16:18:23 haubi Exp $ EAPI="4" @@ -68,8 +68,10 @@ set_abivars() { MY_ASDK=${!MY_ASDK} # abi sourcedir MY_S="${S}/${abi}/instantclient_11_2" + # ABI might not need to be set at all + [[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI= # abi libdir - MY_LIBDIR=$(ABI=${abi} get_libdir) + MY_LIBDIR=$(ABI=${MY_ABI} get_libdir) } pkg_nofetch() { @@ -124,7 +126,7 @@ src_install() { cd "${MY_S}" || die # shared libraries - ABI=${abi} dolib.so lib*$(get_libname)* + ABI=${MY_ABI} dolib.so lib*$(get_libname)* # ensure to be linkable [[ -e libocci$(get_libname) ]] || |