[gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/

[Alfredo Tupone]

commit:     7c489e51eda445f81e772bb2c287748e574879a5
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 05:27:06 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May 23 05:28:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c489e51

dev-ada/gpr: respect ADAFLAGS & LDFLAGS

Closes: https://bugs.gentoo.org/902529
Closes: https://bugs.gentoo.org/902531
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../{gpr-23.0.0-r3.ebuild => gpr-23.0.0-r4.ebuild}   | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r3.ebuild b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
similarity index 84%
rename from dev-ada/gpr/gpr-23.0.0-r3.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r4.ebuild
index 5ac3ae0f761c..a12a8c9c3b0f 100644
--- a/dev-ada/gpr/gpr-23.0.0-r3.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
@@ -46,13 +46,15 @@ src_configure() {
 }
 
 src_compile() {
-       build() {
-               gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-                       -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 gpr2.gpr || die
+       build () {
+               gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+                       -XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
+                       -largs ${LDFLAGS} \
+                       -cargs ${ADAFLAGS} || die "gprbuild failed"
        }
        mkdir -p .build/kb || die
-       gprbuild -p -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
-               --relocate-build-tree || die
+       gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
+               --relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} || 
die
        .build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
        emake -C langkit setup DEST="${S}/.build/lkparser"
        if use shared; then
@@ -81,10 +83,10 @@ src_compile() {
 }
 
 src_install() {
-       build() {
-               gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
-                       -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 --build-name=$1 \
-                       --build-var=LIBRARY_TYPE \
+       build () {
+               gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
+                       --prefix="${D}/usr" -XXMLADA_BUILD=$1 \
+                       --build-name=$1 --build-var=LIBRARY_TYPE \
                        --build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
        }
        if use shared; then