Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.aportgen.binutils: adjust to subpackages in if (MR 2048)

Browse source 
Adjust the code so subpackages="" stays empty even with the latest
version of Alpine's APKBUILD.
This commit is contained in:
Oliver Smith 2021-04-25 15:21:50 +02:00
parent 2a0128d48a
commit 1481e69981
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pmb/aportgen/binutils.py
View file

@ -50,5 +50,8 @@ def generate(args, pkgname):
"gold": None, "gold": None,
} }
replace_simple = {"\tsubpackages=*": "\tsubpackages=\"\""}
pmb.aportgen.core.rewrite(args, pkgname, "main/binutils", fields, pmb.aportgen.core.rewrite(args, pkgname, "main/binutils", fields,
"binutils", replace_functions, remove_indent=8) "binutils", replace_functions, replace_simple,
remove_indent=8)

2
test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD vendored
View file

@ -20,7 +20,7 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
builddir="$srcdir/binutils-$pkgver" builddir="$srcdir/binutils-$pkgver"
if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
subpackages="$subpackages binutils-gold" subpackages=""
fi fi
if [ "$CHOST" != "$CTARGET" ]; then if [ "$CHOST" != "$CTARGET" ]; then