From f852753f1afc2d3286bfa4699e3493c99a384f5f Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Fri, 14 May 2021 20:30:40 +0200 Subject: dev-ada/gprbuild: fix VariableScope for 2020 version Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone --- dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 10 +++------- dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 4 ---- dev-ada/gprbuild/gprbuild-2020.ebuild | 6 +----- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild index 8e9afef371c1..4b54ddf99782 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,10 +54,6 @@ src_prepare() { fi } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" @@ -69,11 +65,11 @@ src_compile() { gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die for bin in ${bin_progs}; do gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ - -o ${bin} -largs gpr_imports.o || die + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die done for lib in $lib_progs; do gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs gpr_imports.o || die + -largs ${LDFLAGS} gpr_imports.o || die done } diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild index d95789381b9f..d3ee4019b229 100644 --- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild @@ -45,10 +45,6 @@ src_prepare() { || die } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index 9d14bd49683a..dd6ac51b2faf 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,10 +45,6 @@ src_prepare() { || die } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" -- cgit v1.2.3-65-gdbad