mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-ada/templates-parser: 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
1898a981be
commit
3bbda7b106
@@ -27,7 +27,7 @@ REQUIRED_USE="|| ( shared static-libs )
|
||||
${ADA_REQUIRED_USE}"
|
||||
|
||||
src_configure() {
|
||||
emake PROCESSORS=$(makeopts_jobs) \
|
||||
emake PROCESSORS=$(get_makeopts_jobs) \
|
||||
DEFAULT_LIBRARY_TYPE=$(usex shared relocatable static) \
|
||||
ENABLE_STATIC=$(usex static-libs true false) \
|
||||
ENABLE_SHARED=$(usex shared true false) \
|
||||
|
||||
@@ -68,7 +68,7 @@ src_configure() {
|
||||
src_compile() {
|
||||
build() {
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
|
||||
--subdirs=${CHOST}/release/$1 \
|
||||
-Ptemplates_parser -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
|
||||
@@ -78,7 +78,7 @@ src_compile() {
|
||||
use static-libs && build static
|
||||
use static-pic && build static-pic
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=relocatable \
|
||||
-XXMLADA_BUILD=relocatable \
|
||||
--subdirs=${CHOST}/release/relocatable -Ptools/tools \
|
||||
@@ -89,7 +89,7 @@ src_compile() {
|
||||
if use test; then
|
||||
cd regtests
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=relocatable \
|
||||
--subdirs=${CHOST}/release/relocatable \
|
||||
-Pregtests -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
|
||||
@@ -101,7 +101,7 @@ src_compile() {
|
||||
src_install() {
|
||||
build() {
|
||||
gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
|
||||
-XTP_XMLADA=Disabled -XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
|
||||
-p -f --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
|
||||
--build-var=TEMPLATES_PARSER_BUILD --subdirs=${CHOST}/release/$1 \
|
||||
@@ -112,7 +112,7 @@ src_install() {
|
||||
use static-libs && build static
|
||||
use static-pic && build static-pic
|
||||
gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux -XTP_XMLADA=Disabled \
|
||||
-XPROCESSORS=$(makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
|
||||
-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -p -f \
|
||||
--prefix="${D}"/usr \
|
||||
--build-var=LIBRARY_TYPE --build-var=TEMPLATES_PARSER_BUILD \
|
||||
|
||||
@@ -68,7 +68,7 @@ src_configure() {
|
||||
src_compile() {
|
||||
build() {
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
|
||||
--subdirs=${CHOST}/release/$1 \
|
||||
-Ptemplates_parser -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
|
||||
@@ -78,7 +78,7 @@ src_compile() {
|
||||
use static-libs && build static
|
||||
use static-pic && build static-pic
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=relocatable \
|
||||
-XXMLADA_BUILD=relocatable \
|
||||
--subdirs=${CHOST}/release/relocatable -Ptools/tools \
|
||||
@@ -89,7 +89,7 @@ src_compile() {
|
||||
if use test; then
|
||||
cd regtests
|
||||
gprbuild -p -v -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XPROCESSORS=$(makeopts_jobs) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=relocatable \
|
||||
--subdirs=${CHOST}/release/relocatable \
|
||||
-Pregtests -largs ${LDFLAGS} -cargs ${ADAFLAGS} \
|
||||
@@ -101,7 +101,7 @@ src_compile() {
|
||||
src_install() {
|
||||
build() {
|
||||
gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux \
|
||||
-XTP_XMLADA=Disabled -XPROCESSORS=$(makeopts_jobs) \
|
||||
-XTP_XMLADA=Disabled -XPROCESSORS=$(get_makeopts_jobs) \
|
||||
-XVERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
|
||||
-p -f --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
|
||||
--build-var=TEMPLATES_PARSER_BUILD --subdirs=${CHOST}/release/$1 \
|
||||
@@ -112,7 +112,7 @@ src_install() {
|
||||
use static-libs && build static
|
||||
use static-pic && build static-pic
|
||||
gprinstall -XPRJ_BUILD=Release -XPRJ_TARGET=Linux -XTP_XMLADA=Disabled \
|
||||
-XPROCESSORS=$(makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
|
||||
-XPROCESSORS=$(get_makeopts_jobs) -XVERSION=$(ver_cut 1-2) \
|
||||
-XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -p -f \
|
||||
--prefix="${D}"/usr \
|
||||
--build-var=LIBRARY_TYPE --build-var=TEMPLATES_PARSER_BUILD \
|
||||
|
||||
Reference in New Issue
Block a user