commit: 7f7653c57cf5f7d60c9d5c97c7d36887e3600f25 Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com> AuthorDate: Thu Jan 20 06:42:16 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 20 12:31:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7653c5
dev-db/ocp: fix AR direct call Closes: https://bugs.gentoo.org/831291 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23879 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/ocp/ocp-0.3.ebuild | 11 ++++++++--- dev-db/ocp/ocp-9999.ebuild | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild index 5c6591bf5df3..47e7110d55b1 100644 --- a/dev-db/ocp/ocp-0.3.ebuild +++ b/dev-db/ocp/ocp-0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Oracle copy tool" HOMEPAGE="https://github.com/maxsatula/ocp" @@ -9,10 +9,11 @@ HOMEPAGE="https://github.com/maxsatula/ocp" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" EGIT_BRANCH="develop" - inherit git-r3 autotools + inherit git-r3 autotools toolchain-funcs else SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" + inherit toolchain-funcs fi LICENSE="GPL-2" @@ -27,6 +28,10 @@ DEPEND=" dev-db/oracle-instantclient[sdk] ${RDEPEND}" +src_compile() { + emake AR="$(tc-getAR)" +} + src_prepare() { default diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild index 5c6591bf5df3..47e7110d55b1 100644 --- a/dev-db/ocp/ocp-9999.ebuild +++ b/dev-db/ocp/ocp-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Oracle copy tool" HOMEPAGE="https://github.com/maxsatula/ocp" @@ -9,10 +9,11 @@ HOMEPAGE="https://github.com/maxsatula/ocp" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/maxsatula/ocp.git" EGIT_BRANCH="develop" - inherit git-r3 autotools + inherit git-r3 autotools toolchain-funcs else SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" + inherit toolchain-funcs fi LICENSE="GPL-2" @@ -27,6 +28,10 @@ DEPEND=" dev-db/oracle-instantclient[sdk] ${RDEPEND}" +src_compile() { + emake AR="$(tc-getAR)" +} + src_prepare() { default