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 | e7ce834e97f01ba9efb09a5dd08c21783af074ec (patch) | |
| tree | 4c05ecdfca062bda5909eadf0a701cddfe7fc8b8 /dev-db | |
| parent | Stop inheriting deprecated qt4.eclass, it was unused anyway. (diff) | |
| download | historical-e7ce834e97f01ba9efb09a5dd08c21783af074ec.tar.gz historical-e7ce834e97f01ba9efb09a5dd08c21783af074ec.tar.bz2 historical-e7ce834e97f01ba9efb09a5dd08c21783af074ec.zip | |
must not set ABI for non-multilib-able archs at all
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/oracle-instantclient-basic/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/oracle-instantclient-basic/Manifest | 10 | ||||
| -rw-r--r-- | dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild | 8 |
3 files changed, 15 insertions, 9 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/Manifest b/dev-db/oracle-instantclient-basic/Manifest index b7f03afd3cd3..3b05ede051d6 100644 --- a/dev-db/oracle-instantclient-basic/Manifest +++ b/dev-db/oracle-instantclient-basic/Manifest @@ -17,13 +17,13 @@ DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c DIST instantclient-sdk-linux32-11.2.0.2.0.zip 638200 RMD160 998e6314d93791cf544f468482089f9f913c7ce4 SHA1 238a6c52731881a77ab0facec276451da4605eb0 SHA256 172c0116de16f55abd775aaf4dd1666d0e64eb1226b43388974ccf83235c8b18 EBUILD oracle-instantclient-basic-10.2.0.3-r1.ebuild 3921 RMD160 d7e9b57eab0dfedde4e7bdea333c8d043b684589 SHA1 5f84a37c80424e1160ec15b9cfcd5bd8bd79eb4d SHA256 d73b72122030197ac5b4b590fe4d64804c15b23b8fcc19e6d59446fcd81331a1 EBUILD oracle-instantclient-basic-11.2.0.2.ebuild 3885 RMD160 7e2d1e495fad6734b9729dd4b1c17a2fe0feb550 SHA1 54d2b27f0c6dc10622d010fbf9a9c00dc0d34473 SHA256 2d5a558336531a4944e1330736980006baad38cbf88459ca068838a4fe0a4b6c -EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 4564 RMD160 c26cf968500e08e8bb47977e311daa1b697b6680 SHA1 fb9c6e07756fe8eaa34fe8eb8ed9e6a577976442 SHA256 964fd651773597df57aa0645cd8d725446a279b4e794270774dd1907561bee55 -MISC ChangeLog 9494 RMD160 a907d15034b66c175ce68e98bdcf00833a958a83 SHA1 406e13b508f9681641e98f1506d9794138121e46 SHA256 37d1482276bf53536dea98ce528642e3f594d4738ecf175e26f66667b8e5c083 +EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 4654 RMD160 d3457ec932687d26085c92be8054a266f4d32942 SHA1 01e708aeed7416f8790720bff7a22cbb9b677010 SHA256 a9efa88b17b2f20dccbc13c9044b9faa7cff24890efe1207595b1d5ac9fd82b3 +MISC ChangeLog 9651 RMD160 0a09e4e98ad1171b11c892789082af7b6ff2ee88 SHA1 d14ca213e57e8ec08540ef68b110a747addc443d SHA256 8db1afa4efdeaca3839e9091a594ae632493bb107333d5d620b45814097c9e94 MISC metadata.xml 330 RMD160 f6fc1cba6cc8c62cc86940331118ec3908edda4b SHA1 bb85a93cee99895dbe00a0e3c468171263fe82f0 SHA256 229663e1b0f455156e4ba1ebe34b4b56bfc13785676a3bec391edcd6a6a9fd67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9Xfv8ACgkQLc0TWKYwzLiCpQCdF6IrunEpeD3/SdNtVs5REpqP -G5wAoKTKEL9Iz/VKmn5g3Rk8Mjkyejxx -=xCN+ +iEYEARECAAYFAk9XilgACgkQLc0TWKYwzLitMACfW8UerS70RBawKRjnxE00C2t5 +0+AAn0XndV/aWnvy/V7MdHv+Yq8nzytw +=ZHu1 -----END PGP SIGNATURE----- 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) ]] || |