mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-ada/gpr: use get_makeopts_*
multiprocessing backward deprecated makeopts_* in <EAPI-9, breaking CI Done via: ``` grep -RP '(?<!get_)makeopts_jobs' sed -e 's/(\(makeopts_jobs\))/\(get_\1)/g' -i */*/*.ebuild eclass/*.eclass sed -e 's/(\(makeopts_jobs\)/\(get_\1/g' -i */*/*.ebuild eclass/*.eclass grep -RP '(?<!get_)makeopts_loadavg' sed -e 's/(\(makeopts_loadavg\))/\(get_\1)/g' -i */*/*.ebuild eclass/*.eclass sed -e 's/(\(makeopts_loadavg\)/\(get_\1/g' -i */*/*.ebuild eclass/*.eclass ``` Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Part-of: https://codeberg.org/gentoo/gentoo/pulls/426 Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
committed by
Alfredo Tupone
parent
6783f1fda4
commit
f7614ecddf
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
|
||||
|
||||
src_compile() {
|
||||
build () {
|
||||
gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
gprbuild -j$(get_makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
|
||||
-largs ${LDFLAGS} \
|
||||
-cargs ${ADAFLAGS} || die "gprbuild failed"
|
||||
@@ -54,7 +54,7 @@ src_compile() {
|
||||
libtype='relocatable'
|
||||
fi
|
||||
|
||||
gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
gprbuild -p -m -v -j$(get_makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} tools/gpr2-tools.gpr \
|
||||
-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
|
||||
src_compile() {
|
||||
emake GPR2KBDIR=/usr/share/gprconfig .build/kb/config.kb
|
||||
build () {
|
||||
gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
gprbuild -j$(get_makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
|
||||
-largs ${LDFLAGS} \
|
||||
-cargs ${ADAFLAGS} || die "gprbuild failed"
|
||||
@@ -43,7 +43,7 @@ src_compile() {
|
||||
use static-libs && build static
|
||||
use static-pic && build static-pic
|
||||
|
||||
gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
gprbuild -p -m -v -j$(get_makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable \
|
||||
tools/gpr2-tools.gpr \
|
||||
-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
|
||||
|
||||
@@ -78,7 +78,7 @@ src_prepare() {
|
||||
|
||||
src_compile() {
|
||||
build () {
|
||||
gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
gprbuild -j$(get_makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
|
||||
-largs ${LDFLAGS} \
|
||||
-cargs ${ADAFLAGS} || die "gprbuild failed"
|
||||
@@ -100,7 +100,7 @@ src_compile() {
|
||||
libtype='relocatable'
|
||||
fi
|
||||
|
||||
gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
gprbuild -p -m -v -j$(get_makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} tools/gpr2-tools.gpr \
|
||||
-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2022-2025 Gentoo Authors
|
||||
# Copyright 2022-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -80,7 +80,7 @@ src_compile() {
|
||||
.build/kb/collect_kb -o .build/kb /usr/share/gprconfig || die
|
||||
|
||||
build () {
|
||||
gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
gprbuild -j$(get_makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
|
||||
-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
|
||||
-largs ${LDFLAGS} \
|
||||
-cargs ${ADAFLAGS} || die "gprbuild failed"
|
||||
@@ -93,7 +93,7 @@ src_compile() {
|
||||
build static-pic
|
||||
fi
|
||||
|
||||
gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
gprbuild -p -m -v -j$(get_makeopts_jobs) -aP . -XGPR2_BUILD=release \
|
||||
-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable tools/gpr2_tools.gpr \
|
||||
-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user